Fixed loadApplication() to not init settings in ACP
authorAlexander Ebert <ebert@woltlab.com>
Thu, 22 Dec 2011 19:00:07 +0000 (20:00 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Thu, 22 Dec 2011 19:00:07 +0000 (20:00 +0100)
wcfsetup/install/files/lib/system/WCF.class.php

index 51c85a0d11440ece0da295a14c25a04e90b6325b..da485e800f12048162bad3a9019ff898c475903b 100644 (file)
@@ -446,7 +446,8 @@ class WCF {
                        throw new exception\SystemException('Unable to run '.$row['package'].', '.$className.' missing.');
                }
                
-               if (!$isDepedentApplication) {
+               // load application settings if not within ACP
+               if (!class_exists('wcf\system\WCFACP', false) && !$isDepedentApplication) {
                        // load options
                        $this->loadOptions($packageDir.'options.inc.php', $application->packageID);