Removes first underscore from tableName of file handlers

This way the tableName property behaves the same way like the property of the package installation plugins.

diff --git a/wcfsetup/install/files/lib/system/package/ACPTemplatesFileHandler.class.php b/wcfsetup/install/files/lib/system/package/ACPTemplatesFileHandler.class.php
index 09573f9cb8356ba609c49e0b37cb8480e53f0356..1c566965bc3118a31080c6a6d37ebb24c20ef9c8 100644 (file)
--- a/wcfsetup/install/files/lib/system/package/ACPTemplatesFileHandler.class.php
+++ b/wcfsetup/install/files/lib/system/package/ACPTemplatesFileHandler.class.php
@@ -16,7 +16,11 @@ use wcf\system\WCF;
  * @category   Community Framework
  */
 class ACPTemplatesFileHandler extends PackageInstallationFileHandler {
-       protected $tableName = '_acp_template';
+       /**
+        * name of the database table where the installed files are logged
+        * @var string
+        */
+       protected $tableName = 'acp_template';
        
        /**
         * @see wcf\system\setup\IFileHandler::checkFiles()
@@ -41,7 +45,7 @@ class ACPTemplatesFileHandler extends PackageInstallationFileHandler {
                                $conditions->add("templateName IN (?)", array($fileNames));
                                
                                $sql = "SELECT          *
-                                       FROM            wcf".WCF_N.$this->tableName."
+                                       FROM            wcf".WCF_N."_".$this->tableName."
                                        ".$conditions;
                                $statement = WCF::getDB()->prepareStatement($sql);
                                $statement->execute($conditions->getParameters());
@@ -78,7 +82,7 @@ class ACPTemplatesFileHandler extends PackageInstallationFileHandler {
                
                // get existing templates
                $sql = "SELECT  templateName
-                       FROM    wcf".WCF_N.$this->tableName."
+                       FROM    wcf".WCF_N."_".$this->tableName."
                        WHERE   packageID = ?";
                $statement = WCF::getDB()->prepareStatement($sql);
                $statement->execute(array($packageID));
@@ -92,7 +96,7 @@ class ACPTemplatesFileHandler extends PackageInstallationFileHandler {
                }
                
                if (count($files)) {
-                       $sql = "INSERT INTO     wcf".WCF_N.$this->tableName."
+                       $sql = "INSERT INTO     wcf".WCF_N."_".$this->tableName."
                                                (packageID, templateName)
                                VALUES          (?, ?)";
                        $statement = WCF::getDB()->prepareStatement($sql);

diff --git a/wcfsetup/install/files/lib/system/package/TemplatesFileHandler.class.php b/wcfsetup/install/files/lib/system/package/TemplatesFileHandler.class.php
index add7d2a58a8814f582df0c70a5e378e0a07c2cc9..0f9a9e6c10b7a3256c0a7e60d448aa026b7d9a1e 100644 (file)
--- a/wcfsetup/install/files/lib/system/package/TemplatesFileHandler.class.php
+++ b/wcfsetup/install/files/lib/system/package/TemplatesFileHandler.class.php
@@ -12,5 +12,8 @@ namespace wcf\system\package;
  * @category   Community Framework
  */
 class TemplatesFileHandler extends ACPTemplatesFileHandler {
-       protected $tableName = '_template';
+       /**
+        * @var wcf\system\package\ACPTemplatesFileHandler::$tableName
+        */
+       protected $tableName = 'template';
 }