From: Matthias Schmidt <gravatronics@live.com>
Date: Mon, 19 Nov 2012 09:35:24 +0000 (+0100)
Subject: Fixes template engines
X-Git-Tag: 2.0.0_Beta_1~762^2~3^2
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=3d8cfc08ed71020a15d9ed003ff54dacfaf0df5e;p=GitHub%2FWoltLab%2FWCF.git

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 868a7cd9fd..8c09abb1ed 100644
--- 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 42e3236531..6418ba022b 100755
--- 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 7d5cd4e4a0..36973d2694 100644
--- 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'],