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

#934110 by dww: Fixed regression: Installer defaults to country 'Afghanistan', not 'None'.

merge-requests/26/head
Angie Byron 2010-10-07 03:26:41 +00:00
parent 65b99dc85f
commit 00ea494765
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
includes/install.core.inc
View File

@ -1759,6 +1759,7 @@ function _install_configure_form($form, &$form_state, &$install_state) {
$form['server_settings']['site_default_country'] = array( $form['server_settings']['site_default_country'] = array(
'#type' => 'select', '#type' => 'select',
'#title' => t('Default country'), '#title' => t('Default country'),
'#empty_value' => '',
'#default_value' => variable_get('site_default_country', NULL), '#default_value' => variable_get('site_default_country', NULL),
'#options' => $countries, '#options' => $countries,
'#description' => st('Select the default country for the site.'), '#description' => st('Select the default country for the site.'),

3
modules/system/system.admin.inc
View File

@ -1870,8 +1870,6 @@ function system_rss_feeds_settings() {
function system_regional_settings() { function system_regional_settings() {
include_once DRUPAL_ROOT . '/includes/locale.inc'; include_once DRUPAL_ROOT . '/includes/locale.inc';
$countries = country_get_list(); $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: // Date settings:
$zones = system_time_zones(); $zones = system_time_zones();
@ -1884,6 +1882,7 @@ function system_regional_settings() {
$form['locale']['site_default_country'] = array( $form['locale']['site_default_country'] = array(
'#type' => 'select', '#type' => 'select',
'#title' => t('Default country'), '#title' => t('Default country'),
'#empty_value' => '',
'#default_value' => variable_get('site_default_country', ''), '#default_value' => variable_get('site_default_country', ''),
'#options' => $countries, '#options' => $countries,
'#attributes' => array('class' => array('country-detect')), '#attributes' => array('class' => array('country-detect')),