Merge pull request #2538 from zikula/revert-2537-cmfcmf-patch-3

Corrected default theme
zikula · Jul 15, 2015 · 4ea5900 · 4ea5900
2 parents 0b4ad61 + 83c9eff
commit 4ea5900
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/src/lib/Zikula/Bundle/CoreInstallerBundle/Controller/AjaxUpgradeController.php b/src/lib/Zikula/Bundle/CoreInstallerBundle/Controller/AjaxUpgradeController.php
@@ -129,8 +129,6 @@ private function upgradeModules()
 
     private function regenerateThemes()
     {
-        // set default theme to Andreas08
-        \System::setVar('Default_Theme', 'ZikulaAndreas08Theme');
         // regenerate the themes list
         return ThemeUtil::regenerate();
     }

diff --git a/src/lib/Zikula/Bundle/CoreInstallerBundle/Stage/Upgrade/InitStage.php b/src/lib/Zikula/Bundle/CoreInstallerBundle/Stage/Upgrade/InitStage.php
@@ -104,7 +104,7 @@ private function init()
         }
 
         // update default theme name
-        $conn->executeQuery("UPDATE module_vars SET value = 'ZikulaAndreas08Theme' WHERE modname = 'ZConfig' AND value='Default_Theme'");
+        $conn->executeQuery("UPDATE module_vars SET value = 's:20:\"ZikulaAndreas08Theme\";' WHERE modname = 'ZConfig' AND name = 'Default_Theme'");
 
         // confirm custom module urls are valid with new routes, reset if not
         $modules = $conn->fetchAll("SELECT * FROM modules");
@@ -143,4 +143,4 @@ private function upgradeUsersModule()
         $item['state'] = \ModUtil::STATE_ACTIVE;
         $this->container->get('doctrine.entitymanager')->flush();
     }
-}
+}