Fixes template engines

diff --git a/wcfsetup/install/files/lib/system/template/SetupTemplateEngine.class.php b/wcfsetup/install/files/lib/system/template/SetupTemplateEngine.class.php
index 868a7cd9fd909da07f1a35da60d7d338fdcde230..8c09abb1edd2beae0424c9e22615f7bb875cb025 100644 (file)
--- a/wcfsetup/install/files/lib/system/template/SetupTemplateEngine.class.php
+++ b/wcfsetup/install/files/lib/system/template/SetupTemplateEngine.class.php
@@ -28,14 +28,14 @@ class SetupTemplateEngine extends TemplateEngine {
        /**
         * @see wcf\system\template\TemplateEngine::getCompiledFilename()
         */
-       public function getCompiledFilename($templateName, $packageID) {
+       public function getCompiledFilename($templateName) {
                return $this->compileDir.'setup/template/compiled/'.$this->languageID.'_'.$templateName.'.php';
        }
        
        /**
         * @see wcf\system\template\TemplateEngine::getMetaDataFilename()
         */
-       public function getMetaDataFilename($templateName, $packageID) {
+       public function getMetaDataFilename($templateName) {
                return $this->compileDir.'setup/template/compiled/'.$this->languageID.'_'.$templateName.'.meta.php';
        }
 

diff --git a/wcfsetup/install/files/lib/system/template/TemplateEngine.class.php b/wcfsetup/install/files/lib/system/template/TemplateEngine.class.php
index 42e323653190aafabad224a81fc4d78d2fb95107..6418ba022b5c85b4c99aae60bea7e893ae1cef62 100755 (executable)
--- a/wcfsetup/install/files/lib/system/template/TemplateEngine.class.php
+++ b/wcfsetup/install/files/lib/system/template/TemplateEngine.class.php
@@ -305,9 +305,9 @@ class TemplateEngine extends SingletonFactory {
                }
                
                $tplPackageID = $this->getPackageID($templateName, $application);
-               $compiledFilename = $this->getCompiledFilename($templateName, $tplPackageID);
+               $compiledFilename = $this->getCompiledFilename($templateName);
                $sourceFilename = $this->getSourceFilename($templateName, $tplPackageID);
-               $metaDataFilename = $this->getMetaDataFilename($templateName, $tplPackageID);
+               $metaDataFilename = $this->getMetaDataFilename($templateName);
                $metaData = $this->getMetaData($templateName, $metaDataFilename);
                
                // check if compilation is necessary

diff --git a/wcfsetup/install/files/lib/system/template/TemplateScriptingCompiler.class.php b/wcfsetup/install/files/lib/system/template/TemplateScriptingCompiler.class.php
index 7d5cd4e4a05a75b5dfcac2cb80df3081c74d6b9e..36973d2694dddad2ce441b4eddfb00515dd46505 100644 (file)
--- a/wcfsetup/install/files/lib/system/template/TemplateScriptingCompiler.class.php
+++ b/wcfsetup/install/files/lib/system/template/TemplateScriptingCompiler.class.php
@@ -791,7 +791,7 @@ class TemplateScriptingCompiler {
                        
                        $tplPackageID = WCF::getTPL()->getPackageID($templateName, $metaData['application']);
                        $sourceFilename = WCF::getTPL()->getSourceFilename($templateName, $tplPackageID);
-                       $metaDataFilename = WCF::getTPL()->getMetaDataFilename($templateName, $tplPackageID);
+                       $metaDataFilename = WCF::getTPL()->getMetaDataFilename($templateName);
                        
                        $data = $this->compileString($templateName, file_get_contents($sourceFilename), array(
                                'application' => $metaData['application'],