summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--includes/theme.inc6
-rw-r--r--modules/system/system.module1
2 files changed, 4 insertions, 3 deletions
diff --git a/includes/theme.inc b/includes/theme.inc
index 762885f86..6e2a69c2e 100644
--- a/includes/theme.inc
+++ b/includes/theme.inc
@@ -199,13 +199,13 @@ function _theme_build_registry($theme, $theme_engine) {
* An array of the currently available themes.
*/
function list_themes($refresh = FALSE) {
- static $list;
+ static $list = array();
if ($refresh) {
- unset($list);
+ $list = array();
}
- if (!$list) {
+ if (empty($list)) {
$list = array();
$result = db_query("SELECT * FROM {system} WHERE type = 'theme'");
while ($theme = db_fetch_object($result)) {
diff --git a/modules/system/system.module b/modules/system/system.module
index d4266b62f..2df59c8c9 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -1258,6 +1258,7 @@ function system_themes_form_submit($form_id, $form_values) {
db_query("UPDATE {system} SET status = 1 WHERE type = 'theme' AND name = 'garland'");
}
+ list_themes(TRUE);
menu_rebuild();
drupal_set_message(t('The configuration options have been saved.'));
return 'admin/build/themes';