diff options
| author | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-10-07 03:26:41 +0000 |
|---|---|---|
| committer | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-10-07 03:26:41 +0000 |
| commit | 00ea494765e4a2d628c6077c3e727c5f47cf986e (patch) | |
| tree | e12f4a61f38a3b11919592954d77a9c79488429a /modules | |
| parent | 65b99dc85fde083cca0938634bb15c4e1779c50d (diff) | |
| download | brdo-00ea494765e4a2d628c6077c3e727c5f47cf986e.tar.gz brdo-00ea494765e4a2d628c6077c3e727c5f47cf986e.tar.bz2 | |
#934110 by dww: Fixed regression: Installer defaults to country 'Afghanistan', not 'None'.
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/system/system.admin.inc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/modules/system/system.admin.inc b/modules/system/system.admin.inc index 2af689a6e..38c4cd838 100644 --- a/modules/system/system.admin.inc +++ b/modules/system/system.admin.inc @@ -1870,8 +1870,6 @@ function system_rss_feeds_settings() { function system_regional_settings() { include_once DRUPAL_ROOT . '/includes/locale.inc'; $countries = country_get_list(); - // Add a 'No default country' option to the start of the list. - $countries = array_merge(array('' => t('No default country')), $countries); // Date settings: $zones = system_time_zones(); @@ -1884,6 +1882,7 @@ function system_regional_settings() { $form['locale']['site_default_country'] = array( '#type' => 'select', '#title' => t('Default country'), + '#empty_value' => '', '#default_value' => variable_get('site_default_country', ''), '#options' => $countries, '#attributes' => array('class' => array('country-detect')), |