From 277b8a020e406c8100afeb9edf29a788cc599a3d Mon Sep 17 00:00:00 2001 From: Marcel Werk Date: Fri, 20 Jun 2014 16:10:21 +0200 Subject: [PATCH] Fixed acp style issue --- wcfsetup/install/files/acp/templates/header.tpl | 2 +- .../install/files/lib/system/style/StyleHandler.class.php | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/wcfsetup/install/files/acp/templates/header.tpl b/wcfsetup/install/files/acp/templates/header.tpl index 67f32d3ed6..d384bf9988 100644 --- a/wcfsetup/install/files/acp/templates/header.tpl +++ b/wcfsetup/install/files/acp/templates/header.tpl @@ -27,7 +27,7 @@ {event name='javascriptInclude'} - {@$__wcf->getStyleHandler()->getStylesheet()} + {@$__wcf->getStyleHandler()->getStylesheet(true)} {event name='stylesheets'} diff --git a/wcfsetup/install/files/lib/system/style/StyleHandler.class.php b/wcfsetup/install/files/lib/system/style/StyleHandler.class.php index 226b2c6fac..3635051f03 100644 --- a/wcfsetup/install/files/lib/system/style/StyleHandler.class.php +++ b/wcfsetup/install/files/lib/system/style/StyleHandler.class.php @@ -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)) { -- 2.20.1