#845742 by Damien Tournoud: Make Bartik the default core theme.

2 files changed, 21 insertions, 18 deletions

diff --git a/profiles/minimal/minimal.install b/profiles/minimal/minimal.install
index 49bb46da7..d7caa03dd 100644
--- a/profiles/minimal/minimal.install
+++ b/profiles/minimal/minimal.install
@@ -8,11 +8,12 @@
  */
 function minimal_install() {
   // Enable some standard blocks.
+  $default_theme = variable_get('theme_default', 'bartik');
   $values = array(
     array(
       'module' => 'system',
       'delta' => 'main',
-      'theme' => 'garland',
+      'theme' => $default_theme,
       'status' => 1,
       'weight' => 0,
       'region' => 'content',
@@ -22,7 +23,7 @@ function minimal_install() {
     array(
       'module' => 'user',
       'delta' => 'login',
-      'theme' => 'garland',
+      'theme' => $default_theme,
       'status' => 1,
       'weight' => 0,
       'region' => 'sidebar_first',
@@ -32,7 +33,7 @@ function minimal_install() {
     array(
       'module' => 'system',
       'delta' => 'navigation',
-      'theme' => 'garland',
+      'theme' => $default_theme,
       'status' => 1,
       'weight' => 0,
       'region' => 'sidebar_first',
@@ -42,7 +43,7 @@ function minimal_install() {
     array(
       'module' => 'system',
       'delta' => 'management',
-      'theme' => 'garland',
+      'theme' => $default_theme,
       'status' => 1,
       'weight' => 1,
       'region' => 'sidebar_first',
@@ -52,7 +53,7 @@ function minimal_install() {
     array(
       'module' => 'system',
       'delta' => 'help',
-      'theme' => 'garland',
+      'theme' => $default_theme,
       'status' => 1,
       'weight' => 0,
       'region' => 'help',
diff --git a/profiles/standard/standard.install b/profiles/standard/standard.install
index cb1b45c66..bae5a19e3 100644
--- a/profiles/standard/standard.install
+++ b/profiles/standard/standard.install
@@ -62,11 +62,13 @@ function standard_install() {
   filter_format_save($full_html_format);
 
   // Enable some standard blocks.
+  $default_theme = variable_get('theme_default', 'bartik');
+  $admin_theme = 'seven';
   $values = array(
     array(
       'module' => 'system',
       'delta' => 'main',
-      'theme' => 'garland',
+      'theme' => $default_theme,
       'status' => 1,
       'weight' => 0,
       'region' => 'content',
@@ -76,7 +78,7 @@ function standard_install() {
     array(
       'module' => 'search',
       'delta' => 'form',
-      'theme' => 'garland',
+      'theme' => $default_theme,
       'status' => 1,
       'weight' => -1,
       'region' => 'sidebar_first',
@@ -86,7 +88,7 @@ function standard_install() {
     array(
       'module' => 'node',
       'delta' => 'recent',
-      'theme' => 'seven',
+      'theme' => $admin_theme,
       'status' => 1,
       'weight' => 10,
       'region' => 'dashboard_main',
@@ -96,7 +98,7 @@ function standard_install() {
     array(
       'module' => 'user',
       'delta' => 'login',
-      'theme' => 'garland',
+      'theme' => $default_theme,
       'status' => 1,
       'weight' => 0,
       'region' => 'sidebar_first',
@@ -106,7 +108,7 @@ function standard_install() {
     array(
       'module' => 'system',
       'delta' => 'navigation',
-      'theme' => 'garland',
+      'theme' => $default_theme,
       'status' => 1,
       'weight' => 0,
       'region' => 'sidebar_first',
@@ -116,7 +118,7 @@ function standard_install() {
     array(
       'module' => 'system',
       'delta' => 'management',
-      'theme' => 'garland',
+      'theme' => $default_theme,
       'status' => 1,
       'weight' => 1,
       'region' => 'sidebar_first',
@@ -126,7 +128,7 @@ function standard_install() {
     array(
       'module' => 'system',
       'delta' => 'powered-by',
-      'theme' => 'garland',
+      'theme' => $default_theme,
       'status' => 1,
       'weight' => 10,
       'region' => 'footer',
@@ -136,7 +138,7 @@ function standard_install() {
     array(
       'module' => 'system',
       'delta' => 'help',
-      'theme' => 'garland',
+      'theme' => $default_theme,
       'status' => 1,
       'weight' => 0,
       'region' => 'help',
@@ -146,7 +148,7 @@ function standard_install() {
     array(
       'module' => 'system',
       'delta' => 'main',
-      'theme' => 'seven',
+      'theme' => $admin_theme,
       'status' => 1,
       'weight' => 0,
       'region' => 'content',
@@ -156,7 +158,7 @@ function standard_install() {
     array(
       'module' => 'system',
       'delta' => 'help',
-      'theme' => 'seven',
+      'theme' => $admin_theme,
       'status' => 1,
       'weight' => 0,
       'region' => 'help',
@@ -166,7 +168,7 @@ function standard_install() {
     array(
       'module' => 'user',
       'delta' => 'login',
-      'theme' => 'seven',
+      'theme' => $admin_theme,
       'status' => 1,
       'weight' => 10,
       'region' => 'content',
@@ -176,7 +178,7 @@ function standard_install() {
     array(
       'module' => 'user',
       'delta' => 'new',
-      'theme' => 'seven',
+      'theme' => $admin_theme,
       'status' => 1,
       'weight' => 0,
       'region' => 'dashboard_sidebar',
@@ -186,7 +188,7 @@ function standard_install() {
     array(
       'module' => 'search',
       'delta' => 'form',
-      'theme' => 'seven',
+      'theme' => $admin_theme,
       'status' => 1,
       'weight' => -10,
       'region' => 'dashboard_sidebar',