diff options
| author | Angie Byron <webchick@24967.no-reply.drupal.org> | 2009-11-19 15:50:23 +0000 |
|---|---|---|
| committer | Angie Byron <webchick@24967.no-reply.drupal.org> | 2009-11-19 15:50:23 +0000 |
| commit | ffb7dcaf334acd83625c565557b43b04a147ba62 (patch) | |
| tree | c606f67421cfdf04abea5b701cc661084d94da87 | |
| parent | ce2fe66cc9daca7ca86ee52f4d1991bd81c382f9 (diff) | |
| download | brdo-ffb7dcaf334acd83625c565557b43b04a147ba62.tar.gz brdo-ffb7dcaf334acd83625c565557b43b04a147ba62.tar.bz2 | |
#547068 follow-up by David_Rothstein: Don't use Seven for maintenance page.
| -rw-r--r-- | includes/theme.maintenance.inc | 6 | ||||
| -rw-r--r-- | modules/simpletest/tests/menu.test | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/includes/theme.maintenance.inc b/includes/theme.maintenance.inc index b2de72351..7b05fcb96 100644 --- a/includes/theme.maintenance.inc +++ b/includes/theme.maintenance.inc @@ -11,8 +11,8 @@ * in maintenance mode. It also applies when the database is unavailable. * * Seven is always used for the initial install and update operations. In - * other cases, "settings.php" must have a "maintenance_theme" key set for the - * $conf variable in order to change the maintenance theme. + * other cases, Minnelli is used, but this can be overridden by setting a + * "maintenance_theme" key in the $conf variable in settings.php. */ function _drupal_maintenance_theme() { global $theme, $theme_key; @@ -46,7 +46,7 @@ function _drupal_maintenance_theme() { drupal_load('module', 'filter'); } - $custom_theme = variable_get('maintenance_theme', 'seven'); + $custom_theme = variable_get('maintenance_theme', 'minnelli'); } $themes = list_themes(); diff --git a/modules/simpletest/tests/menu.test b/modules/simpletest/tests/menu.test index ab3252315..c601b111f 100644 --- a/modules/simpletest/tests/menu.test +++ b/modules/simpletest/tests/menu.test @@ -60,7 +60,7 @@ class MenuIncTestCase extends DrupalWebTestCase { // For a regular user, the fact that the site is in maintenance mode means // we expect the theme callback system to be bypassed entirely. $this->drupalGet('menu-test/theme-callback/use-admin-theme'); - $this->assertRaw('seven/style.css', t("The maintenance theme's CSS appears on the page.")); + $this->assertRaw('minnelli/minnelli.css', t("The maintenance theme's CSS appears on the page.")); // An administrator, however, should continue to see the requested theme. $admin_user = $this->drupalCreateUser(array('access site in maintenance mode')); |