Only set default theme if actual theme is not valid and default theme…

… exists on an upgrade or migrate For #992
Geeklog-Core · Jul 23, 2022 · 9516a3b · 9516a3b
1 parent d76f7d7
commit 9516a3b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/public_html/admin/install/classes/Migrate.php b/public_html/admin/install/classes/Migrate.php
@@ -912,8 +912,11 @@ public function step4()
         }
 
         if (!COM_validateTheme($theme)) {
-            $_CONF['theme'] = $_CONF['theme_geeklog_default'];
-            $config->set('theme', $_CONF['theme_geeklog_default']);
+			// Make sure default theme exists before switching to it
+			if (COM_validateTheme($_CONF['theme_geeklog_default'])) {
+				$_CONF['theme'] = $_CONF['theme_geeklog_default'];
+				$config->set('theme', $_CONF['theme_geeklog_default']);
+			}
         }
 
         /**

diff --git a/public_html/admin/install/classes/Upgrade.php b/public_html/admin/install/classes/Upgrade.php
@@ -72,7 +72,10 @@ private function fixPathsAndUrls($path, $path_html, $site_url, $site_admin_url)
         require_once $path_html . 'lib-common.php';
 
         if (!COM_validateTheme($_CONF['theme'])) {
-            $config->set('theme', $_CONF['theme_geeklog_default']);
+			// Make sure default theme exists before switching to it
+			if (COM_validateTheme($_CONF['theme_geeklog_default'])) {
+				$config->set('theme', $_CONF['theme_geeklog_default']);
+			}
         }
 
         if (!file_exists($_CONF['path_images'] . 'articles')) {