From: Matthias Schmidt <gravatronics@live.com>
Date: Tue, 22 Jul 2014 11:09:19 +0000 (+0200)
Subject: Compiled ACP templates are stored using the active application in filename
X-Git-Tag: 2.1.0_Alpha_1~548^2~1
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=2e9d8f0cc503c7ebc1b28a1ae3795280dd911b43;p=GitHub%2FWoltLab%2FWCF.git

Compiled ACP templates are stored using the active application in filename

Fixes uninstalling applications
---

diff --git a/wcfsetup/install/files/lib/data/application/Application.class.php b/wcfsetup/install/files/lib/data/application/Application.class.php
index 3cd3350374..333cd9a57c 100644
--- a/wcfsetup/install/files/lib/data/application/Application.class.php
+++ b/wcfsetup/install/files/lib/data/application/Application.class.php
@@ -3,8 +3,9 @@ namespace wcf\data\application;
 use wcf\data\package\Package;
 use wcf\data\package\PackageList;
 use wcf\data\DatabaseObject;
-use wcf\system\request\RouteHandler;
+use wcf\system\application\ApplicationHandler;
 use wcf\system\exception\SystemException;
+use wcf\system\request\RouteHandler;
 use wcf\util\FileUtil;
 
 /**
@@ -45,6 +46,15 @@ class Application extends DatabaseObject {
 	 */
 	protected static $directories = null;
 	
+	/**
+	 * Returns the abbreviation of the application.
+	 * 
+	 * @return	string
+	 */
+	public function getAbbreviation() {
+		return ApplicationHandler::getInstance()->getAbbreviation($this->packageID);
+	}
+	
 	/**
 	 * Returns absolute page URL.
 	 * 
diff --git a/wcfsetup/install/files/lib/system/template/ACPTemplateEngine.class.php b/wcfsetup/install/files/lib/system/template/ACPTemplateEngine.class.php
index a283300746..72d41bb08f 100644
--- a/wcfsetup/install/files/lib/system/template/ACPTemplateEngine.class.php
+++ b/wcfsetup/install/files/lib/system/template/ACPTemplateEngine.class.php
@@ -1,5 +1,6 @@
 <?php
 namespace wcf\system\template;
+use wcf\system\application\ApplicationHandler;
 
 /**
  * Loads and displays template in the ACP.
@@ -42,6 +43,13 @@ class ACPTemplateEngine extends TemplateEngine {
 		self::deleteCompiledTemplates($compileDir);
 	}
 	
+	/**
+	 * @see	\wcf\system\template\TemplateEngine::getCompiledFilename()
+	 */
+	public function getCompiledFilename($templateName, $application) {
+		return $this->compileDir.$this->templateGroupID.'_'.ApplicationHandler::getInstance()->getActiveApplication()->getAbbreviation().'_'.$this->languageID.'_'.$templateName.'.php';
+	}
+	
 	/**
 	 * @see	\wcf\system\template\TemplateEngine::setTemplateGroupID()
 	 */