diff options
| author | Gábor Hojtsy <gabor@hojtsy.hu> | 2007-09-17 08:06:52 +0000 |
|---|---|---|
| committer | Gábor Hojtsy <gabor@hojtsy.hu> | 2007-09-17 08:06:52 +0000 |
| commit | 6da81e1f3fc989008e8bee73bd641e027fa9ee80 (patch) | |
| tree | 49088fc8d4148222e5000fbffcf2be95348b8d20 | |
| parent | 9c2f47eafd1aafbcc5cd2aa58b5e6c069f78c8dd (diff) | |
| download | brdo-6da81e1f3fc989008e8bee73bd641e027fa9ee80.tar.gz brdo-6da81e1f3fc989008e8bee73bd641e027fa9ee80.tar.bz2 | |
#171951 by dvessel: fix account specific theme selection form
| -rw-r--r-- | includes/theme.inc | 2 | ||||
| -rw-r--r-- | modules/system/system.module | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/includes/theme.inc b/includes/theme.inc index 484e909c4..188e723cd 100644 --- a/includes/theme.inc +++ b/includes/theme.inc @@ -41,7 +41,7 @@ function init_theme() { // Only select the user selected theme if it is available in the // list of enabled themes. - $theme = !empty($user->theme) && $themes[$user->theme]->status ? $user->theme : variable_get('theme_default', 'garland'); + $theme = !empty($user->theme) && !empty($themes[$user->theme]->status) ? $user->theme : variable_get('theme_default', 'garland'); // Allow modules to override the present theme... only select custom theme // if it is available in the list of installed themes. diff --git a/modules/system/system.module b/modules/system/system.module index 369de9289..b2993353d 100644 --- a/modules/system/system.module +++ b/modules/system/system.module @@ -527,7 +527,7 @@ function system_admin_theme_submit($form, &$form_state) { * @return * a form array */ -function system_theme_select_form(&$form_state, $description = '', $default_value = '', $weight = 0) { +function system_theme_select_form($description = '', $default_value = '', $weight = 0) { if (user_access('select different theme')) { $enabled = array(); $themes = list_themes(); |