Rename function to get compile file prefix

diff --git a/wcfsetup/install/files/lib/system/template/ACPTemplateEngine.class.php b/wcfsetup/install/files/lib/system/template/ACPTemplateEngine.class.php
index 251f41ad5d7a445cf4ad78c55255ea501845dfc2..0b8b48629ac8f8cddbcf72d40629ed14a6fcc78a 100644 (file)
--- a/wcfsetup/install/files/lib/system/template/ACPTemplateEngine.class.php
+++ b/wcfsetup/install/files/lib/system/template/ACPTemplateEngine.class.php
@@ -53,7 +53,7 @@ class ACPTemplateEngine extends TemplateEngine
             $abbreviation = ApplicationHandler::getInstance()->getActiveApplication()->getAbbreviation();
         }
 
-        return $this->getCompileDir($templateName) . '_' . $abbreviation . '_' . $this->languageID . '_' . $templateName . '.php';
+        return $this->getCompileFilePrefix($templateName) . '_' . $abbreviation . '_' . $this->languageID . '_' . $templateName . '.php';
     }
 
     /**

diff --git a/wcfsetup/install/files/lib/system/template/TemplateEngine.class.php b/wcfsetup/install/files/lib/system/template/TemplateEngine.class.php
index ef96e3409add60dccfdee5e8eb29d26941d6157d..b03fd21ff227626c0f87a6064e0af028bd452c15 100755 (executable)
--- a/wcfsetup/install/files/lib/system/template/TemplateEngine.class.php
+++ b/wcfsetup/install/files/lib/system/template/TemplateEngine.class.php
@@ -419,7 +419,7 @@ class TemplateEngine extends SingletonFactory
      */
     public function getCompiledFilename($templateName, $application)
     {
-        return $this->getCompileDir($templateName) . '_' . $application . '_' . $this->languageID . '_' . $templateName . '.php';
+        return $this->getCompileFilePrefix($templateName) . '_' . $application . '_' . $this->languageID . '_' . $templateName . '.php';
     }
 
     /**
@@ -430,7 +430,7 @@ class TemplateEngine extends SingletonFactory
      */
     public function getMetaDataFilename($templateName)
     {
-        return $this->getCompileDir($templateName) . '_' . $templateName . '.meta.php';
+        return $this->getCompileFilePrefix($templateName) . '_' . $templateName . '.meta.php';
     }
 
     /**
@@ -897,17 +897,17 @@ class TemplateEngine extends SingletonFactory
     }
 
     /**
-     * Returns the compile dir for the given template.
+     * Return for a given template the compile directory and file prefix.
      * This function also checks if the template is a shared template.
      *
      * @param string $templateName
      * @return string
      * @since 6.1
      */
-    protected function getCompileDir(string $templateName): string
+    protected function getCompileFilePrefix(string $templateName): string
     {
         if ($this->isSharedTemplate($templateName)) {
-            return $this->compileDir . $this->getSharedTemplateGroupID();
+            return TemplateEngine::getInstance()->compileDir . $this->getSharedTemplateGroupID();
         } else {
             return $this->compileDir . $this->getTemplateGroupID();
         }