diff options
| author | Dries Buytaert <dries@buytaert.net> | 2005-11-14 22:19:14 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2005-11-14 22:19:14 +0000 |
| commit | 0fe57fe68099c4f397bf6b83e9b036aa1b051749 (patch) | |
| tree | 556b67ba63e42615773daaf06adb86cfdc14d310 | |
| parent | 46fee741b5769d755a9441fdb75d1b45f62ab186 (diff) | |
| download | brdo-0fe57fe68099c4f397bf6b83e9b036aa1b051749.tar.gz brdo-0fe57fe68099c4f397bf6b83e9b036aa1b051749.tar.bz2 | |
- Patch #36333 by Tobias Maier: make sure to enable the default theme.
| -rw-r--r-- | modules/system.module | 3 | ||||
| -rw-r--r-- | modules/system/system.module | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/modules/system.module b/modules/system.module index e39cf9e07..414e7306d 100644 --- a/modules/system.module +++ b/modules/system.module @@ -826,7 +826,8 @@ function system_themes_execute($form_id, $values) { if ($_POST['op'] == t('Save configuration')) { if (is_array($values['status'])) { foreach ($values['status'] as $key => $choice) { - if ($choice) { + // Always enable the default theme, despite its status checkbox being checked: + if ($choice || $values['theme_default'] == $key) { // If theme status is being set to 1 from 0, initialize block data for this theme if necessary. if (db_num_rows(db_query("SELECT status FROM {system} WHERE type = 'theme' AND name = '%s' AND status = 0", $key))) { system_initialize_theme_blocks($key); diff --git a/modules/system/system.module b/modules/system/system.module index e39cf9e07..414e7306d 100644 --- a/modules/system/system.module +++ b/modules/system/system.module @@ -826,7 +826,8 @@ function system_themes_execute($form_id, $values) { if ($_POST['op'] == t('Save configuration')) { if (is_array($values['status'])) { foreach ($values['status'] as $key => $choice) { - if ($choice) { + // Always enable the default theme, despite its status checkbox being checked: + if ($choice || $values['theme_default'] == $key) { // If theme status is being set to 1 from 0, initialize block data for this theme if necessary. if (db_num_rows(db_query("SELECT status FROM {system} WHERE type = 'theme' AND name = '%s' AND status = 0", $key))) { system_initialize_theme_blocks($key); |