From 3d4282317afd53b3888ce28b71a341db4f54f91f Mon Sep 17 00:00:00 2001 From: Alexander Ebert Date: Mon, 5 Mar 2012 15:36:31 +0100 Subject: [PATCH] options.inc.php is now loaded within WCFACP --- wcfsetup/install/files/lib/system/WCF.class.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/wcfsetup/install/files/lib/system/WCF.class.php b/wcfsetup/install/files/lib/system/WCF.class.php index 014fad0448..7ca4ba9ed1 100644 --- a/wcfsetup/install/files/lib/system/WCF.class.php +++ b/wcfsetup/install/files/lib/system/WCF.class.php @@ -451,14 +451,14 @@ class WCF { throw new exception\SystemException("Unable to run '".$package->package."', '".$className."' is missing or does not implement 'wcf\system\application\IApplication'."); } + // load options + $this->loadOptions($packageDir.'options.inc.php', $application->packageID); + // register template path in ACP if (class_exists('wcf\system\WCFACP', false)) { $this->getTPL()->addTemplatePath($application->packageID, $packageDir . 'acp/templates/'); } else if (!$isDependentApplication) { - // load options - $this->loadOptions($packageDir.'options.inc.php', $application->packageID); - // assign base tag $this->getTPL()->assign('baseHref', $application->domainName . $application->domainPath); } -- 2.20.1