From: Alexander Ebert <ebert@woltlab.com>
Date: Fri, 7 Dec 2012 14:58:26 +0000 (+0100)
Subject: WCF application is now read from cache
X-Git-Tag: 2.0.0_Beta_1~728^2~5
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=6ddd24ef3ac7ac2a15dbd1120b3f7f4363cae12d;p=GitHub%2FWoltLab%2FWCF.git

WCF application is now read from cache
---

diff --git a/wcfsetup/install/files/lib/system/WCF.class.php b/wcfsetup/install/files/lib/system/WCF.class.php
index a4be74e420..c68ea40b24 100644
--- a/wcfsetup/install/files/lib/system/WCF.class.php
+++ b/wcfsetup/install/files/lib/system/WCF.class.php
@@ -413,15 +413,12 @@ class WCF {
 	 * Initializes applications.
 	 */
 	protected function initApplications() {
-		// register WCF as application
-		self::$applications['wcf'] = new Application(1);
-		
-		// do not init applications if within wcf
-		if (PACKAGE_ID == 1) return;
-		
 		// step 1) load all applications
 		$loadedApplications = array();
 		
+		// register WCF as application
+		self::$applications['wcf'] = ApplicationHandler::getInstance()->getWCF();
+		
 		// start main application
 		$application = ApplicationHandler::getInstance()->getActiveApplication();
 		$loadedApplications[] = $this->loadApplication($application);