Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

#171951 by dvessel: fix account specific theme selection form

6.x
Gábor Hojtsy 2007-09-17 08:06:52 +00:00
parent 9c2f47eafd
commit 6da81e1f3f
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
includes/theme.inc
View File

@ -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.

2
modules/system/system.module
View File

@ -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();