Fix color mode not changing for default theme

MauricioFauth · MauricioFauth · commit 3f09bc27c252 · 2023-05-09T15:52:11.000-03:00
Related to #18267 Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
diff --git a/libraries/classes/Theme/ThemeManager.php b/libraries/classes/Theme/ThemeManager.php
@@ -70,24 +70,25 @@ public function __construct()
 
         $this->theme = new Theme();
 
-        $configThemeExists = true;
-
-        if (! $this->checkTheme($GLOBALS['cfg']['ThemeDefault'])) {
+        $configThemeExists = $this->checkTheme($GLOBALS['cfg']['ThemeDefault']);
+        if (! $configThemeExists) {
             trigger_error(
                 sprintf(
                     __('Default theme %s not found!'),
                     htmlspecialchars($GLOBALS['cfg']['ThemeDefault']),
                 ),
                 E_USER_ERROR,
             );
-            $configThemeExists = false;
         } else {
             $this->themeDefault = $GLOBALS['cfg']['ThemeDefault'];
         }
 
         // check if user have a theme cookie
         $cookieTheme = $this->getThemeCookie();
-        if ($cookieTheme && $this->setActiveTheme($cookieTheme)) {
+        if (
+            $cookieTheme && $this->setActiveTheme($cookieTheme)
+            || $configThemeExists && $this->setActiveTheme($this->themeDefault)
+        ) {
             $colorMode = $this->getColorModeCookie();
             if (is_string($colorMode) && $colorMode !== '') {
                 $this->theme->setColorMode($colorMode);
@@ -96,13 +97,7 @@ public function __construct()
             return;
         }
 
-        if ($configThemeExists) {
-            // otherwise use default theme
-            $this->setActiveTheme($this->themeDefault);
-        } else {
-            // or fallback theme
-            $this->setActiveTheme(self::FALLBACK_THEME);
-        }
+        $this->setActiveTheme(self::FALLBACK_THEME);
     }
 
     /**
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -8581,7 +8581,7 @@ parameters:
 			path: libraries/classes/Theme/Theme.php
 
 		-
-			message: "#^If condition is always true\\.$#"
+			message: "#^Left side of && is always true\\.$#"
 			count: 1
 			path: libraries/classes/Theme/ThemeManager.php
 
@@ -8592,7 +8592,7 @@ parameters:
 
 		-
 			message: "#^Unreachable statement \\- code above always terminates\\.$#"
-			count: 2
+			count: 1
 			path: libraries/classes/Theme/ThemeManager.php
 
 		-
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
@@ -13331,7 +13331,6 @@
       <code>$configThemeExists</code>
     </RedundantCondition>
     <UnevaluatedCode>
-      <code>$configThemeExists = false;</code>
       <code>return false;</code>
     </UnevaluatedCode>
   </file>

Original file line number	Diff line number	Diff line change
`@@ -8581,7 +8581,7 @@ parameters:`
`8581`	`8581`	`path: libraries/classes/Theme/Theme.php`
`8582`	`8582`
`8583`	`8583`	`-`
`8584`		`- message: "#^If condition is always true\\.$#"`
	`8584`	`+ message: "#^Left side of && is always true\\.$#"`
`8585`	`8585`	`count: 1`
`8586`	`8586`	`path: libraries/classes/Theme/ThemeManager.php`
`8587`	`8587`
`@@ -8592,7 +8592,7 @@ parameters:`
`8592`	`8592`
`8593`	`8593`	`-`
`8594`	`8594`	`message: "#^Unreachable statement \\- code above always terminates\\.$#"`
`8595`		`- count: 2`
	`8595`	`+ count: 1`
`8596`	`8596`	`path: libraries/classes/Theme/ThemeManager.php`
`8597`	`8597`
`8598`	`8598`	`-`