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 db33d953bc1b24cec5c147e942a6906a9e5a0477..9173c9506bbb78bf3a825c15869463379cf8d3f4 100644 (file)
--- 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 0692c9349bbdd34762d3d08b3b5054cd5d9e56e2..62d8836580d69bcf592b3a70259aef6dca6f4a1f 100644 (file)
--- 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 d9265bbe49f45c381894cb8c190d61056ae738b9..ce1197f72c301a00bb7a37bfc9c4707aa5428eb2 100644 (file)
--- 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 4d94659aad0c125398226493d5efb2cbc4e4710e..068f8cb9b00d1afcb42fe7a7aa595a1613c09358 100644 (file)
--- 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 1e05525c1a13debc08c4fa552fbf9c2a025b28c3..221298fd7cd3b045fc957776337f3ae2e0beec20 100755 (executable)
--- 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
        }
        
        /**