From: Matthias Schmidt <gravatronics@live.com>
Date: Sun, 23 Mar 2014 21:41:17 +0000 (+0100)
Subject: Marks TemplateListenerCacheBuilder as deprecated
X-Git-Tag: 2.1.0_Alpha_1~956^2~9
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=6dfe934f9f9a2288d250948f238d448ff02eb0e6;p=GitHub%2FWoltLab%2FWCF.git

Marks TemplateListenerCacheBuilder as deprecated

… since it isn't used.
---

diff --git a/wcfsetup/install/files/lib/system/cache/builder/TemplateListenerCacheBuilder.class.php b/wcfsetup/install/files/lib/system/cache/builder/TemplateListenerCacheBuilder.class.php
index db33d953bc..9173c9506b 100644
--- a/wcfsetup/install/files/lib/system/cache/builder/TemplateListenerCacheBuilder.class.php
+++ b/wcfsetup/install/files/lib/system/cache/builder/TemplateListenerCacheBuilder.class.php
@@ -11,6 +11,7 @@ use wcf\data\template\listener\TemplateListenerList;
  * @package	com.woltlab.wcf
  * @subpackage	system.cache.builder
  * @category	Community Framework
+ * @deprecated	since 2.1
  */
 class TemplateListenerCacheBuilder extends AbstractCacheBuilder {
 	/**
diff --git a/wcfsetup/install/files/lib/system/package/PackageInstallationDispatcher.class.php b/wcfsetup/install/files/lib/system/package/PackageInstallationDispatcher.class.php
index 0692c9349b..62d8836580 100644
--- a/wcfsetup/install/files/lib/system/package/PackageInstallationDispatcher.class.php
+++ b/wcfsetup/install/files/lib/system/package/PackageInstallationDispatcher.class.php
@@ -12,7 +12,6 @@ use wcf\data\package\Package;
 use wcf\data\package\PackageEditor;
 use wcf\system\application\ApplicationHandler;
 use wcf\data\object\type\ObjectTypeCache;
-use wcf\system\cache\builder\TemplateListenerCacheBuilder;
 use wcf\system\cache\builder\TemplateListenerCodeCacheBuilder;
 use wcf\system\cache\CacheHandler;
 use wcf\system\database\statement\PreparedStatement;
@@ -197,9 +196,8 @@ class PackageInstallationDispatcher {
 			}
 			
 			// remove template listener cache
-			TemplateListenerCacheBuilder::getInstance()->reset();
 			TemplateListenerCodeCacheBuilder::getInstance()->reset();
-				
+			
 			// reset language cache
 			LanguageFactory::getInstance()->clearCache();
 			LanguageFactory::getInstance()->deleteLanguageCache();
diff --git a/wcfsetup/install/files/lib/system/package/plugin/TemplateListenerPackageInstallationPlugin.class.php b/wcfsetup/install/files/lib/system/package/plugin/TemplateListenerPackageInstallationPlugin.class.php
index d9265bbe49..ce1197f72c 100644
--- a/wcfsetup/install/files/lib/system/package/plugin/TemplateListenerPackageInstallationPlugin.class.php
+++ b/wcfsetup/install/files/lib/system/package/plugin/TemplateListenerPackageInstallationPlugin.class.php
@@ -1,6 +1,5 @@
 <?php
 namespace wcf\system\package\plugin;
-use wcf\system\cache\builder\TemplateListenerCacheBuilder;
 use wcf\system\cache\builder\TemplateListenerCodeCacheBuilder;
 use wcf\system\WCF;
 
@@ -85,7 +84,6 @@ class TemplateListenerPackageInstallationPlugin extends AbstractXMLPackageInstal
 	 */
 	protected function cleanup() {
 		// clear cache immediately
-		TemplateListenerCacheBuilder::getInstance()->reset();
 		TemplateListenerCodeCacheBuilder::getInstance()->reset();
 	}
 }
diff --git a/wcfsetup/install/files/lib/system/template/SetupTemplateEngine.class.php b/wcfsetup/install/files/lib/system/template/SetupTemplateEngine.class.php
index 4d94659aad..068f8cb9b0 100644
--- a/wcfsetup/install/files/lib/system/template/SetupTemplateEngine.class.php
+++ b/wcfsetup/install/files/lib/system/template/SetupTemplateEngine.class.php
@@ -50,11 +50,4 @@ class SetupTemplateEngine extends TemplateEngine {
 	public function getMetaDataFilename($templateName) {
 		return $this->compileDir.'setup/template/compiled/'.$this->languageID.'_'.$templateName.'.meta.php';
 	}
-	
-	/**
-	 * @see	\wcf\system\template\TemplateEngine::loadTemplateListeners()
-	 */
-	protected function loadTemplateListeners() {
-		// template isteners are not available during setup
-	}
 }
diff --git a/wcfsetup/install/files/lib/system/template/TemplateEngine.class.php b/wcfsetup/install/files/lib/system/template/TemplateEngine.class.php
index 1e05525c1a..221298fd7c 100755
--- a/wcfsetup/install/files/lib/system/template/TemplateEngine.class.php
+++ b/wcfsetup/install/files/lib/system/template/TemplateEngine.class.php
@@ -1,7 +1,6 @@
 <?php
 namespace wcf\system\template;
 use wcf\system\cache\builder\TemplateGroupCacheBuilder;
-use wcf\system\cache\builder\TemplateListenerCacheBuilder;
 use wcf\system\cache\builder\TemplateListenerCodeCacheBuilder;
 use wcf\system\event\EventHandler;
 use wcf\system\exception\SystemException;
@@ -704,9 +703,11 @@ class TemplateEngine extends SingletonFactory {
 	
 	/**
 	 * Loads all available template listeners.
+	 * 
+	 * @deprecated	since 2.1
 	 */
 	protected function loadTemplateListeners() {
-		$this->templateListeners = TemplateListenerCacheBuilder::getInstance()->getData(array('environment' => $this->environment));
+		// does nothing
 	}
 	
 	/**