From: Alexander Ebert <ebert@woltlab.com>
Date: Mon, 4 Feb 2013 14:53:36 +0000 (+0100)
Subject: Major overhaul of caching system (work in progress)
X-Git-Tag: 2.0.0_Beta_1~512
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=f1dc282d0193db1580d2e25a023817da6ebd5c3b;p=GitHub%2FWoltLab%2FWCF.git

Major overhaul of caching system (work in progress)

See #1124
---

diff --git a/wcfsetup/install/files/lib/system/WCF.class.php b/wcfsetup/install/files/lib/system/WCF.class.php
index deb265696a..01fa9fcbe3 100644
--- a/wcfsetup/install/files/lib/system/WCF.class.php
+++ b/wcfsetup/install/files/lib/system/WCF.class.php
@@ -111,7 +111,6 @@ class WCF {
 		$this->initMagicQuotes();
 		$this->initDB();
 		$this->loadOptions();
-		$this->initCache();
 		$this->initSession();
 		$this->initLanguage();
 		$this->initTPL();
@@ -289,20 +288,6 @@ class WCF {
 		self::$dbObj = new $dbClass($dbHost, $dbUser, $dbPassword, $dbName, $dbPort);
 	}
 	
-	/**
-	 * Initialises the cache handler and loads the default cache resources.
-	 */
-	protected function initCache() {
-		$this->loadDefaultCacheResources();
-	}
-	
-	/**
-	 * Loads the default cache resources.
-	 */
-	protected function loadDefaultCacheResources() {
-		// TODO: Is this required anymore?
-	}
-	
 	/**
 	 * Loads the options file, automatically created if not exists.
 	 */
diff --git a/wcfsetup/install/files/lib/system/WCFACP.class.php b/wcfsetup/install/files/lib/system/WCFACP.class.php
index 9abc708d46..2f4ff650a5 100644
--- a/wcfsetup/install/files/lib/system/WCFACP.class.php
+++ b/wcfsetup/install/files/lib/system/WCFACP.class.php
@@ -39,7 +39,6 @@ class WCFACP extends WCF {
 		$this->initDB();
 		$this->loadOptions();
 		$this->initPackage();
-		$this->initCache();
 		$this->initSession();
 		$this->initLanguage();
 		$this->initTPL();
@@ -124,15 +123,6 @@ class WCFACP extends WCF {
 		));
 	}
 	
-	/**
-	 * @see	WCF::loadDefaultCacheResources()
-	 */
-	protected function loadDefaultCacheResources() {
-		parent::loadDefaultCacheResources();
-		
-		// TODO: Is this required anymore?
-	}
-	
 	/**
 	 * Initializes the active package.
 	 */
diff --git a/wcfsetup/install/files/lib/system/package/PackageInstallationDispatcher.class.php b/wcfsetup/install/files/lib/system/package/PackageInstallationDispatcher.class.php
index aab03e29ba..76301e5a12 100644
--- a/wcfsetup/install/files/lib/system/package/PackageInstallationDispatcher.class.php
+++ b/wcfsetup/install/files/lib/system/package/PackageInstallationDispatcher.class.php
@@ -1,9 +1,5 @@
 <?php
 namespace wcf\system\package;
-use wcf\system\cache\builder\TemplateListenerCodeCacheBuilder;
-
-use wcf\system\cache\builder\TemplateListenerCacheBuilder;
-
 use wcf\data\application\Application;
 use wcf\data\application\ApplicationEditor;
 use wcf\data\language\category\LanguageCategory;
@@ -15,6 +11,8 @@ use wcf\data\package\installation\queue\PackageInstallationQueueEditor;
 use wcf\data\package\Package;
 use wcf\data\package\PackageEditor;
 use wcf\system\application\ApplicationHandler;
+use wcf\system\cache\builder\TemplateListenerCacheBuilder;
+use wcf\system\cache\builder\TemplateListenerCodeCacheBuilder;
 use wcf\system\cache\CacheHandler;
 use wcf\system\database\statement\PreparedStatement;
 use wcf\system\database\util\PreparedStatementConditionBuilder;
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 afa29925b7..b3de7eae6f 100644
--- a/wcfsetup/install/files/lib/system/package/plugin/TemplateListenerPackageInstallationPlugin.class.php
+++ b/wcfsetup/install/files/lib/system/package/plugin/TemplateListenerPackageInstallationPlugin.class.php
@@ -1,8 +1,7 @@
 <?php
 namespace wcf\system\package\plugin;
-use wcf\system\cache\builder\TemplateListenerCodeCacheBuilder;
-
 use wcf\system\cache\builder\TemplateListenerCacheBuilder;
+use wcf\system\cache\builder\TemplateListenerCodeCacheBuilder;
 use wcf\system\cache\CacheHandler;
 use wcf\system\WCF;