Rename function and create php-doc

diff --git a/wcfsetup/install/files/lib/system/template/ACPTemplateEngine.class.php b/wcfsetup/install/files/lib/system/template/ACPTemplateEngine.class.php
index ca315ac4342c0395663f26342add533e4c63e49a..251f41ad5d7a445cf4ad78c55255ea501845dfc2 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->compileDir . $this->getTemplateGroupID() . '_' . $abbreviation . '_' . $this->languageID . '_' . $templateName . '.php';
+        return $this->getCompileDir($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 c040f2c22d9a6943d5c77dbaeb51317364ee45a1..f24695be81c052bd92ab496d5d0f7ace7768833b 100755 (executable)
--- a/wcfsetup/install/files/lib/system/template/TemplateEngine.class.php
+++ b/wcfsetup/install/files/lib/system/template/TemplateEngine.class.php
@@ -427,13 +427,7 @@ class TemplateEngine extends SingletonFactory
      */
     public function getCompiledFilename($templateName, $application)
     {
-        $path = $this->compileDir;
-        if ($this->isSharedTemplate($templateName)) {
-            $path .= $this->sharedTemplateGroupID;
-        } else {
-            $path .= $this->getTemplateGroupID();
-        }
-        return $path . '_' . $application . '_' . $this->languageID . '_' . $templateName . '.php';
+        return $this->getCompileDir($templateName) . '_' . $application . '_' . $this->languageID . '_' . $templateName . '.php';
     }
 
     /**
@@ -444,13 +438,7 @@ class TemplateEngine extends SingletonFactory
      */
     public function getMetaDataFilename($templateName)
     {
-        $path = $this->compileDir;
-        if ($this->isSharedTemplate($templateName)) {
-            $path .= $this->sharedTemplateGroupID;
-        } else {
-            $path .= $this->getTemplateGroupID();
-        }
-        return $path . '_' . $templateName . '.meta.php';
+        return $this->getCompileDir($templateName) . '_' . $templateName . '.meta.php';
     }
 
     /**
@@ -903,8 +891,33 @@ class TemplateEngine extends SingletonFactory
         return $data;
     }
 
+    /**
+     * Checks whether the given template is a shared template.
+     * Starts with 'shared_'.
+     *
+     * @param string $templateName
+     * @return bool
+     * @since 6.1
+     */
     protected function isSharedTemplate(string $templateName): bool
     {
         return \str_starts_with($templateName, 'shared_');
     }
+
+    /**
+     * Returns the compile dir for the given template.
+     * 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
+    {
+        if ($this->isSharedTemplate($templateName)) {
+            return $this->compileDir . $this->sharedTemplateGroupID;
+        } else {
+            return $this->compileDir . $this->getTemplateGroupID();
+        }
+    }
 }