Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

#547068 follow-up by David_Rothstein: Don't use Seven for maintenance page.

merge-requests/26/head
Angie Byron 2009-11-19 15:50:23 +00:00
parent ce2fe66cc9
commit ffb7dcaf33
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
includes/theme.maintenance.inc
View File

@ -11,8 +11,8 @@
* in maintenance mode. It also applies when the database is unavailable. * in maintenance mode. It also applies when the database is unavailable.
* *
* Seven is always used for the initial install and update operations. In * 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 * other cases, Minnelli is used, but this can be overridden by setting a
* $conf variable in order to change the maintenance theme. * "maintenance_theme" key in the $conf variable in settings.php.
*/ */
function _drupal_maintenance_theme() { function _drupal_maintenance_theme() {
global $theme, $theme_key; global $theme, $theme_key;
@ -46,7 +46,7 @@ function _drupal_maintenance_theme() {
drupal_load('module', 'filter'); drupal_load('module', 'filter');
} }
$custom_theme = variable_get('maintenance_theme', 'seven'); $custom_theme = variable_get('maintenance_theme', 'minnelli');
} }
$themes = list_themes(); $themes = list_themes();

2
modules/simpletest/tests/menu.test
View File

@ -60,7 +60,7 @@ class MenuIncTestCase extends DrupalWebTestCase {
// For a regular user, the fact that the site is in maintenance mode means // For a regular user, the fact that the site is in maintenance mode means
// we expect the theme callback system to be bypassed entirely. // we expect the theme callback system to be bypassed entirely.
$this->drupalGet('menu-test/theme-callback/use-admin-theme'); $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. // An administrator, however, should continue to see the requested theme.
$admin_user = $this->drupalCreateUser(array('access site in maintenance mode')); $admin_user = $this->drupalCreateUser(array('access site in maintenance mode'));