Index: modules/system.module =================================================================== RCS file: /cvs/drupal/drupal/modules/system.module,v retrieving revision 1.260 diff -u -r1.260 system.module --- modules/system.module 29 Nov 2005 02:52:20 -0000 1.260 +++ modules/system.module 29 Nov 2005 16:00:40 -0000 @@ -160,30 +160,33 @@ function system_user($type, $edit, &$user, $category = NULL) { if ($type == 'form' && $category == 'account') { $themes = list_themes(); - ksort($themes); - - // Reset to follow site default theme if user selects the site default - if ($key == variable_get('theme_default', 'bluemarine')) { - $key = ''; - if ($edit['theme'] == variable_get('theme_default', 'bluemarine')) { - $edit['theme'] = ''; + + if (count($themes) > 1) { + ksort($themes); + + // Reset to follow site default theme if user selects the site default + if ($key == variable_get('theme_default', 'bluemarine')) { + $key = ''; + if ($edit['theme'] == variable_get('theme_default', 'bluemarine')) { + $edit['theme'] = ''; + } } - } - $form['themes'] = array( - '#type' => 'fieldset', '#title' => t('Theme configuration'), '#description' => t('Selecting a different theme will change the look and feel of the site.'), '#weight' => 2, '#collapsible' => TRUE, '#theme' => 'system_user'); + $form['themes'] = array( + '#type' => 'fieldset', '#title' => t('Theme configuration'), '#description' => t('Selecting a different theme will change the look and feel of the site.'), '#weight' => 2, '#collapsible' => TRUE, '#theme' => 'system_user'); - foreach ($themes as $info) { - $info->screenshot = dirname($info->filename) . '/screenshot.png'; - $screenshot = file_exists($info->screenshot) ? theme('image', $info->screenshot, t('Screenshot for %theme theme', array('%theme' => $info->name)), '', array('class' => 'screenshot'), false) : t('no screenshot'); + foreach ($themes as $info) { + $info->screenshot = dirname($info->filename) . '/screenshot.png'; + $screenshot = file_exists($info->screenshot) ? theme('image', $info->screenshot, t('Screenshot for %theme theme', array('%theme' => $info->name)), '', array('class' => 'screenshot'), false) : t('no screenshot'); + + $form['themes'][$info->name]['screenshot'] = array('#type' => 'markup', '#value' => $screenshot); + $form['themes'][$info->name]['description'] = array('#type' => 'item', '#title' => $info->name, '#value' => dirname($info->filename)); + $options[$info->name] = ''; + } - $form['themes'][$info->name]['screenshot'] = array('#type' => 'markup', '#value' => $screenshot); - $form['themes'][$info->name]['description'] = array('#type' => 'item', '#title' => $info->name, '#value' => dirname($info->filename)); - $options[$info->name] = ''; + $form['themes']['theme'] = array('#type' => 'radios', '#options' => $options, '#default_value' => $edit['theme'] ? $edit['theme'] : variable_get('theme_default', 'bluemarine')); } - $form['themes']['theme'] = array('#type' => 'radios', '#options' => $options, '#default_value' => $edit['theme'] ? $edit['theme'] : variable_get('theme_default', 'bluemarine')); - if (variable_get('configurable_timezones', 1)) { $zones = _system_zonelist(); $form['locale'] = array('#type'=>'item', '#title' => t('Locale settings'), '#weight' => 6);