From ef8753573236c0b649faa5918969a486c6901c47 Mon Sep 17 00:00:00 2001 From: Matthias Schmidt Date: Wed, 20 Jul 2011 16:53:09 +0200 Subject: [PATCH] CacheBuilder get their own folder/namespace Like I suggested here http://www.woltlab.com/bugtracker/index.php?page=B ug&bugID=1304, CacheBuilder get their own folder and now also own namesp ace like the event listeners. --- .../files/lib/acp/form/AbstractOptionListForm.class.php | 2 +- .../install/files/lib/acp/page/UserListPage.class.php | 2 +- .../install/files/lib/data/style/ActiveStyle.class.php | 2 +- wcfsetup/install/files/lib/data/user/User.class.php | 2 +- .../install/files/lib/data/user/group/UserGroup.class.php | 2 +- wcfsetup/install/files/lib/system/WCF.class.php | 8 ++++---- wcfsetup/install/files/lib/system/WCFACP.class.php | 4 ++-- .../lib/system/application/ApplicationHandler.class.php | 2 +- .../cache/{ => builder}/CacheBuilderACPMenu.class.php | 4 ++-- .../cache/{ => builder}/CacheBuilderApplication.class.php | 2 +- .../{ => builder}/CacheBuilderCleanupAdapter.class.php | 2 +- .../cache/{ => builder}/CacheBuilderCoreObject.class.php | 2 +- .../cache/{ => builder}/CacheBuilderCronjob.class.php | 2 +- .../{ => builder}/CacheBuilderEventListener.class.php | 4 ++-- .../system/cache/{ => builder}/CacheBuilderIcon.class.php | 2 +- .../cache/{ => builder}/CacheBuilderLanguage.class.php | 4 ++-- .../cache/{ => builder}/CacheBuilderOption.class.php | 4 ++-- .../cache/{ => builder}/CacheBuilderPackage.class.php | 4 ++-- .../{ => builder}/CacheBuilderPackageDependency.class.php | 2 +- .../cache/{ => builder}/CacheBuilderPageMenu.class.php | 2 +- .../cache/{ => builder}/CacheBuilderSpider.class.php | 4 ++-- .../cache/{ => builder}/CacheBuilderStyle.class.php | 4 ++-- .../cache/{ => builder}/CacheBuilderTemplate.class.php | 4 ++-- .../{ => builder}/CacheBuilderTemplateGroup.class.php | 2 +- .../{ => builder}/CacheBuilderTemplateListener.class.php | 2 +- .../CacheBuilderTemplateListenerCode.class.php | 2 +- .../cache/{ => builder}/CacheBuilderUserGroup.class.php | 4 ++-- .../CacheBuilderUserGroupPermission.class.php | 4 ++-- .../files/lib/system/cleanup/CleanupHandler.class.php | 2 +- .../files/lib/system/cronjob/CronjobScheduler.class.php | 2 +- .../install/files/lib/system/event/EventHandler.class.php | 4 ++-- .../files/lib/system/language/LanguageFactory.class.php | 2 +- .../install/files/lib/system/menu/acp/ACPMenu.class.php | 4 ++-- .../install/files/lib/system/menu/page/PageMenu.class.php | 4 ++-- .../lib/system/package/PackageDependencyHandler.class.php | 2 +- .../files/lib/system/session/SessionHandler.class.php | 2 +- .../install/files/lib/system/style/StyleHandler.class.php | 2 +- .../files/lib/system/template/TemplateEngine.class.php | 6 +++--- 38 files changed, 57 insertions(+), 57 deletions(-) rename wcfsetup/install/files/lib/system/cache/{ => builder}/CacheBuilderACPMenu.class.php (96%) rename wcfsetup/install/files/lib/system/cache/{ => builder}/CacheBuilderApplication.class.php (98%) rename wcfsetup/install/files/lib/system/cache/{ => builder}/CacheBuilderCleanupAdapter.class.php (97%) rename wcfsetup/install/files/lib/system/cache/{ => builder}/CacheBuilderCoreObject.class.php (97%) rename wcfsetup/install/files/lib/system/cache/{ => builder}/CacheBuilderCronjob.class.php (97%) rename wcfsetup/install/files/lib/system/cache/{ => builder}/CacheBuilderEventListener.class.php (95%) rename wcfsetup/install/files/lib/system/cache/{ => builder}/CacheBuilderIcon.class.php (98%) rename wcfsetup/install/files/lib/system/cache/{ => builder}/CacheBuilderLanguage.class.php (95%) rename wcfsetup/install/files/lib/system/cache/{ => builder}/CacheBuilderOption.class.php (96%) rename wcfsetup/install/files/lib/system/cache/{ => builder}/CacheBuilderPackage.class.php (90%) rename wcfsetup/install/files/lib/system/cache/{ => builder}/CacheBuilderPackageDependency.class.php (98%) rename wcfsetup/install/files/lib/system/cache/{ => builder}/CacheBuilderPageMenu.class.php (98%) rename wcfsetup/install/files/lib/system/cache/{ => builder}/CacheBuilderSpider.class.php (91%) rename wcfsetup/install/files/lib/system/cache/{ => builder}/CacheBuilderStyle.class.php (94%) rename wcfsetup/install/files/lib/system/cache/{ => builder}/CacheBuilderTemplate.class.php (94%) rename wcfsetup/install/files/lib/system/cache/{ => builder}/CacheBuilderTemplateGroup.class.php (94%) rename wcfsetup/install/files/lib/system/cache/{ => builder}/CacheBuilderTemplateListener.class.php (97%) rename wcfsetup/install/files/lib/system/cache/{ => builder}/CacheBuilderTemplateListenerCode.class.php (97%) rename wcfsetup/install/files/lib/system/cache/{ => builder}/CacheBuilderUserGroup.class.php (93%) rename wcfsetup/install/files/lib/system/cache/{ => builder}/CacheBuilderUserGroupPermission.class.php (96%) diff --git a/wcfsetup/install/files/lib/acp/form/AbstractOptionListForm.class.php b/wcfsetup/install/files/lib/acp/form/AbstractOptionListForm.class.php index 8085e4b0e9..96b88e17c9 100755 --- a/wcfsetup/install/files/lib/acp/form/AbstractOptionListForm.class.php +++ b/wcfsetup/install/files/lib/acp/form/AbstractOptionListForm.class.php @@ -38,7 +38,7 @@ abstract class AbstractOptionListForm extends AbstractForm { * cache class name * @var string */ - public $cacheClass = 'wcf\system\cache\CacheBuilderOption'; + public $cacheClass = 'wcf\system\cache\builder\CacheBuilderOption'; /** * list of all option categories diff --git a/wcfsetup/install/files/lib/acp/page/UserListPage.class.php b/wcfsetup/install/files/lib/acp/page/UserListPage.class.php index 7ec60a4510..b24a85ce9d 100755 --- a/wcfsetup/install/files/lib/acp/page/UserListPage.class.php +++ b/wcfsetup/install/files/lib/acp/page/UserListPage.class.php @@ -258,7 +258,7 @@ class UserListPage extends SortablePage { protected function readUserOptions() { // add cache resource $cacheName = 'user-option-'.PACKAGE_ID; - CacheHandler::getInstance()->addResource($cacheName, WCF_DIR.'cache/cache.'.$cacheName.'.php', 'wcf\system\cache\CacheBuilderOption'); + CacheHandler::getInstance()->addResource($cacheName, WCF_DIR.'cache/cache.'.$cacheName.'.php', 'wcf\system\cache\builder\CacheBuilderOption'); // get options $this->options = CacheHandler::getInstance()->get($cacheName, 'options'); diff --git a/wcfsetup/install/files/lib/data/style/ActiveStyle.class.php b/wcfsetup/install/files/lib/data/style/ActiveStyle.class.php index e8a33271db..2d94ee9ab3 100644 --- a/wcfsetup/install/files/lib/data/style/ActiveStyle.class.php +++ b/wcfsetup/install/files/lib/data/style/ActiveStyle.class.php @@ -41,7 +41,7 @@ class ActiveStyle extends DatabaseObjectDecorator { } // load icon cache - WCF::getCache()->addResource('icon-'.PACKAGE_ID.'-'.$this->styleID, WCF_DIR.'cache/cache.icon-'.PACKAGE_ID.'-'.$this->styleID.'.php', 'wcf\system\cache\CacheBuilderIcon'); + WCF::getCache()->addResource('icon-'.PACKAGE_ID.'-'.$this->styleID, WCF_DIR.'cache/cache.icon-'.PACKAGE_ID.'-'.$this->styleID.'.php', 'wcf\system\cache\builder\CacheBuilderIcon'); $this->iconCache = WCF::getCache()->get('icon-'.PACKAGE_ID.'-'.$this->styleID); } diff --git a/wcfsetup/install/files/lib/data/user/User.class.php b/wcfsetup/install/files/lib/data/user/User.class.php index 944b891881..52e6585416 100644 --- a/wcfsetup/install/files/lib/data/user/User.class.php +++ b/wcfsetup/install/files/lib/data/user/User.class.php @@ -174,7 +174,7 @@ class User extends DatabaseObject { */ protected static function getUserOptionCache() { $cacheName = 'user-option-'.PACKAGE_ID; - CacheHandler::getInstance()->addResource($cacheName, WCF_DIR.'cache/cache.'.$cacheName.'.php', 'wcf\system\cache\CacheBuilderOption'); + CacheHandler::getInstance()->addResource($cacheName, WCF_DIR.'cache/cache.'.$cacheName.'.php', 'wcf\system\cache\builder\CacheBuilderOption'); self::$userOptions = CacheHandler::getInstance()->get($cacheName, 'options'); } diff --git a/wcfsetup/install/files/lib/data/user/group/UserGroup.class.php b/wcfsetup/install/files/lib/data/user/group/UserGroup.class.php index a6e1705e9e..39810f480c 100644 --- a/wcfsetup/install/files/lib/data/user/group/UserGroup.class.php +++ b/wcfsetup/install/files/lib/data/user/group/UserGroup.class.php @@ -193,7 +193,7 @@ class UserGroup extends DatabaseObject { */ protected static function getCache() { if (self::$cache === null) { - CacheHandler::getInstance()->addResource('usergroups', WCF_DIR.'cache/cache.usergroups.php', 'wcf\system\cache\CacheBuilderUserGroup'); + CacheHandler::getInstance()->addResource('usergroups', WCF_DIR.'cache/cache.usergroups.php', 'wcf\system\cache\builder\CacheBuilderUserGroup'); self::$cache = CacheHandler::getInstance()->get('usergroups'); } } diff --git a/wcfsetup/install/files/lib/system/WCF.class.php b/wcfsetup/install/files/lib/system/WCF.class.php index ab74b4e79b..8eb198cb5b 100644 --- a/wcfsetup/install/files/lib/system/WCF.class.php +++ b/wcfsetup/install/files/lib/system/WCF.class.php @@ -297,10 +297,10 @@ class WCF { * Loads the default cache resources. */ protected function loadDefaultCacheResources() { - CacheHandler::getInstance()->addResource('languages', WCF_DIR.'cache/cache.languages.php', 'wcf\system\cache\CacheBuilderLanguage'); - CacheHandler::getInstance()->addResource('spiders', WCF_DIR.'cache/cache.spiders.php', 'wcf\system\cache\CacheBuilderSpider'); + CacheHandler::getInstance()->addResource('languages', WCF_DIR.'cache/cache.languages.php', 'wcf\system\cache\builder\CacheBuilderLanguage'); + CacheHandler::getInstance()->addResource('spiders', WCF_DIR.'cache/cache.spiders.php', 'wcf\system\builder\cache\CacheBuilderSpider'); if (defined('PACKAGE_ID')) { - CacheHandler::getInstance()->addResource('coreObjects-'.PACKAGE_ID, WCF_DIR.'cache/cache.coreObjects-'.PACKAGE_ID.'.php', 'wcf\system\cache\CacheBuilderCoreObject'); + CacheHandler::getInstance()->addResource('coreObjects-'.PACKAGE_ID, WCF_DIR.'cache/cache.coreObjects-'.PACKAGE_ID.'.php', 'wcf\system\cache\builder\CacheBuilderCoreObject'); } } @@ -561,4 +561,4 @@ class WCF { return null; } -} +} diff --git a/wcfsetup/install/files/lib/system/WCFACP.class.php b/wcfsetup/install/files/lib/system/WCFACP.class.php index 0fb2656dcd..504a09459e 100644 --- a/wcfsetup/install/files/lib/system/WCFACP.class.php +++ b/wcfsetup/install/files/lib/system/WCFACP.class.php @@ -93,7 +93,7 @@ class WCFACP extends WCF { */ protected function loadDefaultCacheResources() { parent::loadDefaultCacheResources(); - CacheHandler::getInstance()->addResource('packages', WCF_DIR.'cache/cache.packages.php', 'wcf\system\cache\CacheBuilderPackage'); + CacheHandler::getInstance()->addResource('packages', WCF_DIR.'cache/cache.packages.php', 'wcf\system\cache\builder\CacheBuilderPackage'); } /** @@ -174,4 +174,4 @@ class WCFACP extends WCF { } } } -} +} diff --git a/wcfsetup/install/files/lib/system/application/ApplicationHandler.class.php b/wcfsetup/install/files/lib/system/application/ApplicationHandler.class.php index 8c851b0bad..9e569c001a 100644 --- a/wcfsetup/install/files/lib/system/application/ApplicationHandler.class.php +++ b/wcfsetup/install/files/lib/system/application/ApplicationHandler.class.php @@ -28,7 +28,7 @@ class ApplicationHandler extends SingletonFactory { CacheHandler::getInstance()->addResource( 'application-'.PACKAGE_ID, WCF_DIR.'cache/cache.application-'.PACKAGE_ID.'.php', - 'wcf\system\cache\CacheBuilderApplication' + 'wcf\system\cache\builder\CacheBuilderApplication' ); $this->cache = CacheHandler::getInstance()->get('application-'.PACKAGE_ID); } diff --git a/wcfsetup/install/files/lib/system/cache/CacheBuilderACPMenu.class.php b/wcfsetup/install/files/lib/system/cache/builder/CacheBuilderACPMenu.class.php similarity index 96% rename from wcfsetup/install/files/lib/system/cache/CacheBuilderACPMenu.class.php rename to wcfsetup/install/files/lib/system/cache/builder/CacheBuilderACPMenu.class.php index 592975656b..fc504cfb5b 100644 --- a/wcfsetup/install/files/lib/system/cache/CacheBuilderACPMenu.class.php +++ b/wcfsetup/install/files/lib/system/cache/builder/CacheBuilderACPMenu.class.php @@ -1,5 +1,5 @@ getObjects(); } -} +} diff --git a/wcfsetup/install/files/lib/system/cache/CacheBuilderPackageDependency.class.php b/wcfsetup/install/files/lib/system/cache/builder/CacheBuilderPackageDependency.class.php similarity index 98% rename from wcfsetup/install/files/lib/system/cache/CacheBuilderPackageDependency.class.php rename to wcfsetup/install/files/lib/system/cache/builder/CacheBuilderPackageDependency.class.php index 49d5c119f9..254294ff0d 100644 --- a/wcfsetup/install/files/lib/system/cache/CacheBuilderPackageDependency.class.php +++ b/wcfsetup/install/files/lib/system/cache/builder/CacheBuilderPackageDependency.class.php @@ -1,5 +1,5 @@ getObjects(); } -} +} diff --git a/wcfsetup/install/files/lib/system/cache/CacheBuilderStyle.class.php b/wcfsetup/install/files/lib/system/cache/builder/CacheBuilderStyle.class.php similarity index 94% rename from wcfsetup/install/files/lib/system/cache/CacheBuilderStyle.class.php rename to wcfsetup/install/files/lib/system/cache/builder/CacheBuilderStyle.class.php index 91d81b112a..9654d6130d 100644 --- a/wcfsetup/install/files/lib/system/cache/CacheBuilderStyle.class.php +++ b/wcfsetup/install/files/lib/system/cache/builder/CacheBuilderStyle.class.php @@ -1,5 +1,5 @@ typeObjects[$type]; } -} +} diff --git a/wcfsetup/install/files/lib/system/cleanup/CleanupHandler.class.php b/wcfsetup/install/files/lib/system/cleanup/CleanupHandler.class.php index 0afefe3f06..277981ae9a 100644 --- a/wcfsetup/install/files/lib/system/cleanup/CleanupHandler.class.php +++ b/wcfsetup/install/files/lib/system/cleanup/CleanupHandler.class.php @@ -52,7 +52,7 @@ class CleanupHandler { CacheHandler::getInstance()->addResource( 'cleanupAdapter-'.PACKAGE_ID, WCF_DIR.'cache/cache.cleanupAdapter.php', - 'wcf\system\cache\CacheBuilderCleanupAdapter' + 'wcf\system\cache\builder\CacheBuilderCleanupAdapter' ); $this->cache = CacheHandler::getInstance()->get('cleanupAdapter'); diff --git a/wcfsetup/install/files/lib/system/cronjob/CronjobScheduler.class.php b/wcfsetup/install/files/lib/system/cronjob/CronjobScheduler.class.php index c5fbd33e32..526902f4e7 100644 --- a/wcfsetup/install/files/lib/system/cronjob/CronjobScheduler.class.php +++ b/wcfsetup/install/files/lib/system/cronjob/CronjobScheduler.class.php @@ -188,7 +188,7 @@ abstract class CronjobScheduler { */ protected static function getCache() { $cacheName = 'cronjobs-'.PACKAGE_ID; - CacheHandler::getInstance()->addResource($cacheName, WCF_DIR.'cache/cache.'.$cacheName.'.php', 'wcf\system\cache\CacheBuilderCronjob'); + CacheHandler::getInstance()->addResource($cacheName, WCF_DIR.'cache/cache.'.$cacheName.'.php', 'wcf\system\cache\builder\CacheBuilderCronjob'); return CacheHandler::getInstance()->get($cacheName); } diff --git a/wcfsetup/install/files/lib/system/event/EventHandler.class.php b/wcfsetup/install/files/lib/system/event/EventHandler.class.php index 832c91c687..0aa88bc825 100644 --- a/wcfsetup/install/files/lib/system/event/EventHandler.class.php +++ b/wcfsetup/install/files/lib/system/event/EventHandler.class.php @@ -54,7 +54,7 @@ class EventHandler extends SingletonFactory { * Loads all registered actions of the active package. */ protected function loadActions() { - CacheHandler::getInstance()->addResource('eventListener-'.PACKAGE_ID, WCF_DIR.'cache/cache.eventListener-'.PACKAGE_ID.'.php', 'wcf\system\cache\CacheBuilderEventListener'); + CacheHandler::getInstance()->addResource('eventListener-'.PACKAGE_ID, WCF_DIR.'cache/cache.eventListener-'.PACKAGE_ID.'.php', 'wcf\system\cache\builder\CacheBuilderEventListener'); $cache = CacheHandler::getInstance()->get('eventListener-'.PACKAGE_ID); if (isset($cache['actions'])) $this->actions = $cache['actions']; if (isset($cache['inheritedActions'])) $this->inheritedActions = $cache['inheritedActions']; @@ -187,4 +187,4 @@ class EventHandler extends SingletonFactory { public static function generateKey($className, $eventName) { return $eventName.'@'.$className; } -} +} diff --git a/wcfsetup/install/files/lib/system/language/LanguageFactory.class.php b/wcfsetup/install/files/lib/system/language/LanguageFactory.class.php index 6ebbc37d0d..4af396bdd2 100644 --- a/wcfsetup/install/files/lib/system/language/LanguageFactory.class.php +++ b/wcfsetup/install/files/lib/system/language/LanguageFactory.class.php @@ -214,7 +214,7 @@ abstract class LanguageFactory { CacheHandler::getInstance()->addResource( 'languages', WCF_DIR.'cache/cache.languages.php', - 'wcf\system\cache\CacheBuilderLanguage' + 'wcf\system\cache\builder\CacheBuilderLanguage' ); self::$cache = CacheHandler::getInstance()->get('languages'); diff --git a/wcfsetup/install/files/lib/system/menu/acp/ACPMenu.class.php b/wcfsetup/install/files/lib/system/menu/acp/ACPMenu.class.php index cf95905e6e..21b39c54f3 100644 --- a/wcfsetup/install/files/lib/system/menu/acp/ACPMenu.class.php +++ b/wcfsetup/install/files/lib/system/menu/acp/ACPMenu.class.php @@ -24,7 +24,7 @@ class ACPMenu extends TreeMenu { return; } - CacheHandler::getInstance()->addResource('menu-'.PACKAGE_ID, WCF_DIR.'cache/cache.menu-'.PACKAGE_ID.'.php', 'wcf\system\cache\CacheBuilderACPMenu'); + CacheHandler::getInstance()->addResource('menu-'.PACKAGE_ID, WCF_DIR.'cache/cache.menu-'.PACKAGE_ID.'.php', 'wcf\system\cache\builder\CacheBuilderACPMenu'); $this->menuItems = CacheHandler::getInstance()->get('menu-'.PACKAGE_ID); } -} +} diff --git a/wcfsetup/install/files/lib/system/menu/page/PageMenu.class.php b/wcfsetup/install/files/lib/system/menu/page/PageMenu.class.php index 3e818aca8d..0eb9a51df4 100644 --- a/wcfsetup/install/files/lib/system/menu/page/PageMenu.class.php +++ b/wcfsetup/install/files/lib/system/menu/page/PageMenu.class.php @@ -23,7 +23,7 @@ class PageMenu extends TreeMenu { parent::loadCache(); // get cache - CacheHandler::getInstance()->addResource('pageMenu-'.PACKAGE_ID, WCF_DIR.'cache/cache.pageMenu-'.PACKAGE_ID.'.php', 'wcf\system\cache\CacheBuilderPageMenu'); + CacheHandler::getInstance()->addResource('pageMenu-'.PACKAGE_ID, WCF_DIR.'cache/cache.pageMenu-'.PACKAGE_ID.'.php', 'wcf\system\cache\builder\CacheBuilderPageMenu'); $this->menuItems = CacheHandler::getInstance()->get('pageMenu-'.PACKAGE_ID); } @@ -35,4 +35,4 @@ class PageMenu extends TreeMenu { return $item->getProvider()->isVisible(); } -} +} diff --git a/wcfsetup/install/files/lib/system/package/PackageDependencyHandler.class.php b/wcfsetup/install/files/lib/system/package/PackageDependencyHandler.class.php index 0932e71deb..2c1dec1af7 100644 --- a/wcfsetup/install/files/lib/system/package/PackageDependencyHandler.class.php +++ b/wcfsetup/install/files/lib/system/package/PackageDependencyHandler.class.php @@ -72,7 +72,7 @@ abstract class PackageDependencyHandler { CacheHandler::getInstance()->addResource( 'packageDependencies-'.PACKAGE_ID, WCF_DIR.'cache/cache.packageDependencies-'.PACKAGE_ID.'.php', - 'wcf\system\cache\CacheBuilderPackageDependency' + 'wcf\system\cache\builder\CacheBuilderPackageDependency' ); self::$packageDependencyCache = CacheHandler::getInstance()->get('packageDependencies-'.PACKAGE_ID); diff --git a/wcfsetup/install/files/lib/system/session/SessionHandler.class.php b/wcfsetup/install/files/lib/system/session/SessionHandler.class.php index bf8745a8c4..ce8f524eb3 100644 --- a/wcfsetup/install/files/lib/system/session/SessionHandler.class.php +++ b/wcfsetup/install/files/lib/system/session/SessionHandler.class.php @@ -439,7 +439,7 @@ class SessionHandler extends SingletonFactory { CacheHandler::getInstance()->addResource( 'groups-'.PACKAGE_ID.'-'.$groups, WCF_DIR.'cache/cache.groups-'.PACKAGE_ID.'-'.$groupsFileName.'.php', - 'wcf\system\cache\CacheBuilderUserGroupPermission' + 'wcf\system\cache\builder\CacheBuilderUserGroupPermission' ); // get group data from cache diff --git a/wcfsetup/install/files/lib/system/style/StyleHandler.class.php b/wcfsetup/install/files/lib/system/style/StyleHandler.class.php index 044891016e..e4a9c7e213 100644 --- a/wcfsetup/install/files/lib/system/style/StyleHandler.class.php +++ b/wcfsetup/install/files/lib/system/style/StyleHandler.class.php @@ -34,7 +34,7 @@ class StyleHandler extends SingletonFactory { */ protected function init() { // load cache - CacheHandler::getInstance()->addResource('styles', WCF_DIR.'cache/cache.styles.php', 'wcf\system\cache\CacheBuilderStyle'); + CacheHandler::getInstance()->addResource('styles', WCF_DIR.'cache/cache.styles.php', 'wcf\system\cache\builder\CacheBuilderStyle'); $this->cache = CacheHandler::getInstance()->get('styles'); } diff --git a/wcfsetup/install/files/lib/system/template/TemplateEngine.class.php b/wcfsetup/install/files/lib/system/template/TemplateEngine.class.php index 0eaa67b289..2db0782ad4 100644 --- a/wcfsetup/install/files/lib/system/template/TemplateEngine.class.php +++ b/wcfsetup/install/files/lib/system/template/TemplateEngine.class.php @@ -571,7 +571,7 @@ class TemplateEngine extends SingletonFactory { * Loads cached template group information. */ protected function loadTemplateGroupCache() { - CacheHandler::getInstance()->addResource('templateGroups', WCF_DIR.'cache/cache.templateGroups.php', 'wcf\system\cache\CacheBuilderTemplateGroup'); + CacheHandler::getInstance()->addResource('templateGroups', WCF_DIR.'cache/cache.templateGroups.php', 'wcf\system\cache\builder\CacheBuilderTemplateGroup'); $this->templateGroupCache = CacheHandler::getInstance()->get('templateGroups'); } @@ -645,7 +645,7 @@ class TemplateEngine extends SingletonFactory { CacheHandler::getInstance()->addResource( $cacheName, WCF_DIR.'cache/cache.'.$cacheName.'.php', - 'wcf\system\cache\CacheBuilderTemplateListener' + 'wcf\system\cache\builder\CacheBuilderTemplateListener' ); $this->templateListeners = CacheHandler::getInstance()->get($cacheName); @@ -678,7 +678,7 @@ class TemplateEngine extends SingletonFactory { CacheHandler::getInstance()->addResource( $cacheName, WCF_DIR.'cache/templateListener/'.$cacheName.'.php', - 'wcf\system\cache\CacheBuilderTemplateListenerCode' + 'wcf\system\cache\builder\CacheBuilderTemplateListenerCode' ); $this->templateListeners[$templateName] = CacheHandler::getInstance()->get($cacheName); -- 2.20.1