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 a4be74e4200b66cd26c216bc19ac09765a90a6c2..c68ea40b249b978ebce6fde968a4220a95722f06 100644 (file)
--- 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);