diff options
| author | Dries Buytaert <dries@buytaert.net> | 2010-02-15 15:07:57 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2010-02-15 15:07:57 +0000 |
| commit | 4c9fd48cedb88ca3e4e1e19ef862feadb9e244d3 (patch) | |
| tree | cda0d33d678111fea0a12d693395252b9d71be1b /modules/system/system.admin.inc | |
| parent | 6dbec233ca66dc9a48bf7e764c5be4a761795da8 (diff) | |
| download | brdo-4c9fd48cedb88ca3e4e1e19ef862feadb9e244d3.tar.gz brdo-4c9fd48cedb88ca3e4e1e19ef862feadb9e244d3.tar.bz2 | |
- Patch #687210 by joachim: fixed errors and erroneous warning when admin theme is 'default'.
Diffstat (limited to 'modules/system/system.admin.inc')
| -rw-r--r-- | modules/system/system.admin.inc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/modules/system/system.admin.inc b/modules/system/system.admin.inc index 1436bb9ca..5e7fa8a2e 100644 --- a/modules/system/system.admin.inc +++ b/modules/system/system.admin.inc @@ -429,9 +429,10 @@ function system_theme_default() { } // Set the default theme. variable_set('theme_default', $theme); - // The status message depends on whether an admin theme is currently in use. + // The status message depends on whether an admin theme is currently in use: + // a value of 0 means the admin theme is set to be the default theme. $admin_theme = variable_get('admin_theme', 0); - if ($admin_theme != $theme) { + if ($admin_theme != 0 && $admin_theme != $theme) { drupal_set_message(t('Please note that the administration theme is still set to the %admin_theme theme; consequently, the theme on this page remains unchanged. All non-administrative sections of the site, however, will show the selected %selected_theme theme by default.', array( '%admin_theme' => $themes[$admin_theme]->info['name'], '%selected_theme' => $themes[$theme]->info['name'], |