options.inc.php is now loaded within WCFACP

diff --git a/wcfsetup/install/files/lib/system/WCF.class.php b/wcfsetup/install/files/lib/system/WCF.class.php
index 014fad0448276df7c33569cd8df320dbb7b8fbee..7ca4ba9ed1875583762ae1a806b47bfd04c26fd2 100644 (file)
--- 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);
                }