Fixed template delete

diff --git a/wcfsetup/install/files/lib/data/template/TemplateEditor.class.php b/wcfsetup/install/files/lib/data/template/TemplateEditor.class.php
index 2239fe7f65db135eba9020481de1177965567f9a..8a169e7d00d820c8c0ab6ca70bd09bf01d8372fe 100644 (file)
--- a/wcfsetup/install/files/lib/data/template/TemplateEditor.class.php
+++ b/wcfsetup/install/files/lib/data/template/TemplateEditor.class.php
@@ -109,6 +109,21 @@ class TemplateEditor extends DatabaseObjectEditor {
                $this->deleteCompiledFiles();
        }
        
+       /**
+        * @see wcf\data\IEditableObject::deleteAll()
+        */
+       public static function deleteAll(array $objectIDs = array()) {
+               $list = new TemplateList();
+               $list->setObjectIDs($objectIDs);
+               $list->readObjects();
+               foreach ($list as $template) {
+                       $editor = new TemplateEditor($template);
+                       $editor->deleteFile();
+               }
+               
+               return parent::deleteAll($objectIDs);
+       }
+       
        /**
         * Deletes the compiled files of this template.
         */

diff --git a/wcfsetup/install/files/lib/data/template/TemplateList.class.php b/wcfsetup/install/files/lib/data/template/TemplateList.class.php
index 0e8a8c40f848281757d2eec2534a2b2f28a05021..ee95106d4170aa06b0d4fe197d6904589bbe53a1 100644 (file)
--- a/wcfsetup/install/files/lib/data/template/TemplateList.class.php
+++ b/wcfsetup/install/files/lib/data/template/TemplateList.class.php
@@ -24,7 +24,8 @@ class TemplateList extends DatabaseObjectList {
        public function __construct() {
                parent::__construct();
                
-               $this->sqlSelects = 'package.package, package.packageDir';
+               $this->sqlSelects = 'package.package, package.packageDir, template_group.templateGroupFolderName';
                $this->sqlJoins = " LEFT JOIN wcf".WCF_N."_package package ON (package.packageID = template.packageID)";
+               $this->sqlJoins .= " LEFT JOIN wcf".WCF_N."_template_group template_group ON (template_group.templateGroupID = template.templateGroupID)";
        }
 }