From 6dfe934f9f9a2288d250948f238d448ff02eb0e6 Mon Sep 17 00:00:00 2001 From: Matthias Schmidt Date: Sun, 23 Mar 2014 22:41:17 +0100 Subject: [PATCH] Marks TemplateListenerCacheBuilder as deprecated MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit … since it isn't used. --- .../cache/builder/TemplateListenerCacheBuilder.class.php | 1 + .../system/package/PackageInstallationDispatcher.class.php | 4 +--- .../TemplateListenerPackageInstallationPlugin.class.php | 2 -- .../lib/system/template/SetupTemplateEngine.class.php | 7 ------- .../files/lib/system/template/TemplateEngine.class.php | 5 +++-- 5 files changed, 5 insertions(+), 14 deletions(-) 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 @@ 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 @@ templateListeners = TemplateListenerCacheBuilder::getInstance()->getData(array('environment' => $this->environment)); + // does nothing } /** -- 2.20.1