getStyleHandler() is now embedded within WCF class

diff --git a/com.woltlab.wcf/coreObject.xml b/com.woltlab.wcf/coreObject.xml
index e68ca487e16870df5b0e7eff215e8d9ebf8bf2e4..6f75bc6d4819d1aa7140e25088000ec0d49b376e 100644 (file)
--- a/com.woltlab.wcf/coreObject.xml
+++ b/com.woltlab.wcf/coreObject.xml
@@ -16,8 +16,5 @@
                <coreobject>
                        <objectname><![CDATA[wcf\system\benchmark\Benchmark]]></objectname>
                </coreobject>
-               <coreobject>
-                       <objectname><![CDATA[wcf\system\style\StyleHandler]]></objectname>
-               </coreobject>
        </import>
 </data>

diff --git a/wcfsetup/install/files/acp/templates/header.tpl b/wcfsetup/install/files/acp/templates/header.tpl
index adf055a9e2811963fd711703a7c8b07aa05783ae..9fe7b8e23186339ad08c167c79378aff688868f3 100644 (file)
--- a/wcfsetup/install/files/acp/templates/header.tpl
+++ b/wcfsetup/install/files/acp/templates/header.tpl
@@ -29,7 +29,7 @@
        
        <!-- Stylesheets -->
        {* work-around for unknown core-object during WCFSetup *}
-       {if PACKAGE_ID}{@$__wcf->getStyleHandler()->getStylesheet(true)}{/if}
+       {@$__wcf->getStyleHandler()->getStylesheet()}
        
        {*
        {if $specialStyles|isset}

diff --git a/wcfsetup/install/files/lib/system/WCF.class.php b/wcfsetup/install/files/lib/system/WCF.class.php
index 26ee5ee92f822f08a3389730f54498bc97e66bd9..f79c0d3aab4adfcd577e40656856c756c66d90ad 100644 (file)
--- a/wcfsetup/install/files/lib/system/WCF.class.php
+++ b/wcfsetup/install/files/lib/system/WCF.class.php
@@ -9,6 +9,7 @@ use wcf\system\language\LanguageFactory;
 use wcf\system\package\PackageInstallationDispatcher;
 use wcf\system\session\SessionFactory;
 use wcf\system\session\SessionHandler;
+use wcf\system\style\StyleHandler;
 use wcf\system\template\TemplateEngine;
 use wcf\system\user\storage\UserStorageHandler;
 use wcf\system\exception;
@@ -639,6 +640,15 @@ class WCF {
                return $baseHref . 'index.php' . $path . '#' . $fragment;
        }
        
+       /**
+        * Returns style handler.
+        * 
+        * @return      wcf\system\style\StyleHandler
+        */
+       public function getStyleHandler() {
+               return StyleHandler::getInstance();
+       }
+       
        /**
         * Initialises the cronjobs.
         */

diff --git a/wcfsetup/install/files/lib/system/style/StyleHandler.class.php b/wcfsetup/install/files/lib/system/style/StyleHandler.class.php
index 350b3cdbb92632ecaca8d2909f2d1d634683771a..7b829e91bbea251804590269a2eac614a1bf9a1d 100644 (file)
--- a/wcfsetup/install/files/lib/system/style/StyleHandler.class.php
+++ b/wcfsetup/install/files/lib/system/style/StyleHandler.class.php
@@ -4,6 +4,7 @@ use wcf\data\style\ActiveStyle;
 use wcf\system\application\ApplicationHandler;
 use wcf\system\cache\CacheHandler;
 use wcf\system\exception\SystemException;
+use wcf\system\request\RequestHandler;
 use wcf\system\SingletonFactory;
 use wcf\system\WCF;
 
@@ -119,11 +120,10 @@ class StyleHandler extends SingletonFactory {
         * 
         * @todo        Add RTL support
         * 
-        * @param       boolean         $isACP
         * @return      string
         */
-       public function getStylesheet($isACP = false) {
-               if ($isACP) {
+       public function getStylesheet() {
+               if (RequestHandler::getInstance()->isACPRequest()) {
                        // ACP
                        $filename = 'acp/style/style.css';
                        if (!file_exists(WCF_DIR.$filename)) {