diff options
| author | Dries Buytaert <dries@buytaert.net> | 2006-01-04 09:32:28 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2006-01-04 09:32:28 +0000 |
| commit | 9385794e235c6e291a02540bdfe0ce6cd0367449 (patch) | |
| tree | 99d24c423b797707d1f0d538ab89dc274578df41 | |
| parent | 3dae958731450beeda816286b947016ec263ded1 (diff) | |
| download | brdo-9385794e235c6e291a02540bdfe0ce6cd0367449.tar.gz brdo-9385794e235c6e291a02540bdfe0ce6cd0367449.tar.bz2 | |
- Patch #41548 by Neil: critical bugfix: theme didn't load when styles are used.
| -rw-r--r-- | includes/theme.inc | 2 | ||||
| -rw-r--r-- | modules/system.module | 2 | ||||
| -rw-r--r-- | modules/system/system.module | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/includes/theme.inc b/includes/theme.inc index cd12e3f55..cf520c95c 100644 --- a/includes/theme.inc +++ b/includes/theme.inc @@ -99,7 +99,7 @@ function list_themes($refresh = FALSE) { if (!$list) { $list = array(); - $result = db_query("SELECT * FROM {system} WHERE type = 'theme' AND status = 1"); + $result = db_query("SELECT * FROM {system} WHERE type = 'theme'"); while ($theme = db_fetch_object($result)) { if (file_exists($theme->filename)) { $list[$theme->name] = $theme; diff --git a/modules/system.module b/modules/system.module index f8e5016ca..a61fd4dfd 100644 --- a/modules/system.module +++ b/modules/system.module @@ -167,7 +167,7 @@ function system_test() { function system_user($type, $edit, &$user, $category = NULL) { if ($type == 'form' && $category == 'account') { if (user_access('select different theme')) { - $themes = list_themes(); + $themes = array_filter(list_themes(), create_function('$theme', 'return $theme->status;')); if (count($themes) > 1) { ksort($themes); diff --git a/modules/system/system.module b/modules/system/system.module index f8e5016ca..a61fd4dfd 100644 --- a/modules/system/system.module +++ b/modules/system/system.module @@ -167,7 +167,7 @@ function system_test() { function system_user($type, $edit, &$user, $category = NULL) { if ($type == 'form' && $category == 'account') { if (user_access('select different theme')) { - $themes = list_themes(); + $themes = array_filter(list_themes(), create_function('$theme', 'return $theme->status;')); if (count($themes) > 1) { ksort($themes); |