Commit 00ea4947 authored by webchick's avatar webchick

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

parent 65b99dc8
......@@ -1759,6 +1759,7 @@ function _install_configure_form($form, &$form_state, &$install_state) {
$form['server_settings']['site_default_country'] = array(
'#type' => 'select',
'#title' => t('Default country'),
'#empty_value' => '',
'#default_value' => variable_get('site_default_country', NULL),
'#options' => $countries,
'#description' => st('Select the default country for the site.'),
......
......@@ -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')),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment