Fixed acp style issue
authorMarcel Werk <burntime@woltlab.com>
Fri, 20 Jun 2014 14:10:21 +0000 (16:10 +0200)
committerMarcel Werk <burntime@woltlab.com>
Fri, 20 Jun 2014 14:10:21 +0000 (16:10 +0200)
wcfsetup/install/files/acp/templates/header.tpl
wcfsetup/install/files/lib/system/style/StyleHandler.class.php

index 67f32d3ed66841d01d3f17d5f0c4d34eebfebb0f..d384bf9988e7cb8a232d366c0e5d546ede75a02b 100644 (file)
@@ -27,7 +27,7 @@
        {event name='javascriptInclude'}
        
        <!-- Stylesheets -->
-       {@$__wcf->getStyleHandler()->getStylesheet()}
+       {@$__wcf->getStyleHandler()->getStylesheet(true)}
        {event name='stylesheets'}
        
        <!-- Icons -->
index 226b2c6facfa3df760fb4685302c3c774ed6a5c2..3635051f032cfe8db752cb7f18f54971ca273976 100644 (file)
@@ -4,7 +4,6 @@ use wcf\data\style\ActiveStyle;
 use wcf\data\style\Style;
 use wcf\system\cache\builder\StyleCacheBuilder;
 use wcf\system\exception\SystemException;
-use wcf\system\request\RequestHandler;
 use wcf\system\SingletonFactory;
 use wcf\system\WCF;
 
@@ -116,10 +115,11 @@ class StyleHandler extends SingletonFactory {
        /**
         * Returns the HTML tag to include current stylesheet.
         * 
+        * @param       boolean         $isACP          indicates if the request is an acp request
         * @return      string
         */
-       public function getStylesheet() {
-               if (RequestHandler::getInstance()->isACPRequest()) {
+       public function getStylesheet($isACP = false) {
+               if ($isACP) {
                        // ACP
                        $filename = 'acp/style/style'.(WCF::getLanguage()->get('wcf.global.pageDirection') == 'rtl' ? '-rtl' : '').'.css';
                        if (!file_exists(WCF_DIR.$filename)) {