Merge branch '6.2' of https://github.com/WoltLab/WCF into 6.2

Author: BurntimeX

wcfsetup/install/files/lib/system/style/StyleHandler.class.php

@@ -72,13 +72,15 @@ public function getStyles()
 
     /**
      * Returns the active style.
-     *
-     * @return  ActiveStyle
      */
-    public function getStyle()
+    public function getStyle(): ActiveStyle
     {
         if ($this->style === null) {
-            $this->changeStyle();
+            if (RequestHandler::getInstance()->isACPRequest()) {
+                $this->style = new ActiveStyle($this->getDefaultStyle());
+            } else {
+                $this->changeStyle();
+            }
         }
 
         return $this->style;