From d2146d87addeac9fd2b7e3197707ad6e9d48864a Mon Sep 17 00:00:00 2001 From: Marcel Werk Date: Fri, 26 Apr 2013 01:40:46 +0200 Subject: [PATCH] Fixed template delete --- .../lib/data/template/TemplateEditor.class.php | 15 +++++++++++++++ .../lib/data/template/TemplateList.class.php | 3 ++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/wcfsetup/install/files/lib/data/template/TemplateEditor.class.php b/wcfsetup/install/files/lib/data/template/TemplateEditor.class.php index 2239fe7f65..8a169e7d00 100644 --- 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 0e8a8c40f8..ee95106d41 100644 --- 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)"; } } -- 2.20.1