Correct the loading of shared templates

diff --git a/com.woltlab.wcf/acpTemplateDelete.xml b/com.woltlab.wcf/acpTemplateDelete.xml
index 93f78fd32f38ed3c5da24bf8f23a8a29f74e8e27..64c66d0cc1eba5808f612f1eb9da3b21dab396d0 100644 (file)
--- a/com.woltlab.wcf/acpTemplateDelete.xml
+++ b/com.woltlab.wcf/acpTemplateDelete.xml
@@ -151,5 +151,10 @@
                <template>userOptionsCondition</template>
                <template>worker</template>
                <template>wysiwyg</template>
+               <template>articleBBCode</template>
+               <template>mediaBBCodeTag</template>
+               <template>groupBBCodeTag</template>
+               <template>__videoAttachmentBBCode</template>
+               <template>__audioAttachmentBBCode</template>
        </delete>
 </data>

diff --git a/com.woltlab.wcf/templateDelete.xml b/com.woltlab.wcf/templateDelete.xml
index 0c21a55b99d87e6376b8e8bf154c96198558cc54..68a1dabbdca6f028e8602f1ab62b0000adf52fbb 100644 (file)
--- a/com.woltlab.wcf/templateDelete.xml
+++ b/com.woltlab.wcf/templateDelete.xml
@@ -108,6 +108,8 @@
                <template>userOptionsCondition</template>
                <template>worker</template>
                <template>wysiwyg</template>
+               <template>articleBBCode</template>
+               <template>mediaBBCodeTag</template>
                <template>groupBBCodeTag</template>
                <template>__videoAttachmentBBCode</template>
                <template>__audioAttachmentBBCode</template>

diff --git a/wcfsetup/install/files/lib/system/template/TemplateEngine.class.php b/wcfsetup/install/files/lib/system/template/TemplateEngine.class.php
index 9265c5df4c4f24cfcd261ad4f5740fc086c79fcd..76eee33e6db9a12e3466b36568b22dac664daced 100755 (executable)
--- a/wcfsetup/install/files/lib/system/template/TemplateEngine.class.php
+++ b/wcfsetup/install/files/lib/system/template/TemplateEngine.class.php
@@ -387,7 +387,11 @@ class TemplateEngine extends SingletonFactory
     protected function getPath($templatePath, $templateName)
     {
         if (!Template::isSystemCritical($templateName)) {
-            $templateGroupID = $this->getTemplateGroupID();
+            if (TemplateEngine::isSharedTemplate($templateName)) {
+                $templateGroupID = $this->getSharedTemplateGroupID();
+            } else {
+                $templateGroupID = $this->getTemplateGroupID();
+            }
             while ($templateGroupID != 0) {
                 $templateGroup = $this->templateGroupCache[$templateGroupID];
 
@@ -917,8 +921,8 @@ class TemplateEngine extends SingletonFactory
     {
         if (!isset($this->sharedTemplateGroupID)) {
             $sql = "SELECT  templateGroupID
-                FROM    wcf" . WCF_N . "_template_group
-                WHERE   templateGroupFolderName = ?";
+                    FROM    wcf" . WCF_N . "_template_group
+                    WHERE   templateGroupFolderName = ?";
             $statement = WCF::getDB()->prepareStatement($sql);
             $statement->execute(['_wcf_shared/']);