summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2006-01-17 17:35:47 +0000
committerDries Buytaert <dries@buytaert.net>2006-01-17 17:35:47 +0000
commite14586624321f21dbfe4da224444e9c50cc21033 (patch)
treef455e20bf65ab61596ebf7172009e08a1ab42b0f
parente41e8acda3fd0d2f5c22f363a87652d0c3d07334 (diff)
downloadbrdo-e14586624321f21dbfe4da224444e9c50cc21033.tar.gz
brdo-e14586624321f21dbfe4da224444e9c50cc21033.tar.bz2
- Patch #44136 by riccardoR: can't enable more than one language.
-rw-r--r--modules/locale.module4
-rw-r--r--modules/locale/locale.module4
-rw-r--r--modules/system.module4
-rw-r--r--modules/system/system.module4
4 files changed, 8 insertions, 8 deletions
diff --git a/modules/locale.module b/modules/locale.module
index 86dcc5d4b..e1f305e3f 100644
--- a/modules/locale.module
+++ b/modules/locale.module
@@ -279,10 +279,10 @@ function locale_admin_manage() {
}
if ($key == 'en') {
// Disallow name change for English locale
- db_query("UPDATE {locales_meta} SET isdefault = %d, enabled = %d WHERE locale = 'en'", ($edit['sitedefault'] == $key), $edit['enabled'][$key]);
+ db_query("UPDATE {locales_meta} SET isdefault = %d, enabled = %d WHERE locale = 'en'", ($edit['sitedefault'] == $key), isset($edit['enabled'][$key]));
}
else {
- db_query("UPDATE {locales_meta} SET name = '%s', isdefault = %d, enabled = %d WHERE locale = '%s'", $edit['name'][$key], ($edit['sitedefault'] == $key), $edit['enabled'][$key], $key);
+ db_query("UPDATE {locales_meta} SET name = '%s', isdefault = %d, enabled = %d WHERE locale = '%s'", $edit['name'][$key], ($edit['sitedefault'] == $key), isset($edit['enabled'][$key]), $key);
}
}
diff --git a/modules/locale/locale.module b/modules/locale/locale.module
index 86dcc5d4b..e1f305e3f 100644
--- a/modules/locale/locale.module
+++ b/modules/locale/locale.module
@@ -279,10 +279,10 @@ function locale_admin_manage() {
}
if ($key == 'en') {
// Disallow name change for English locale
- db_query("UPDATE {locales_meta} SET isdefault = %d, enabled = %d WHERE locale = 'en'", ($edit['sitedefault'] == $key), $edit['enabled'][$key]);
+ db_query("UPDATE {locales_meta} SET isdefault = %d, enabled = %d WHERE locale = 'en'", ($edit['sitedefault'] == $key), isset($edit['enabled'][$key]));
}
else {
- db_query("UPDATE {locales_meta} SET name = '%s', isdefault = %d, enabled = %d WHERE locale = '%s'", $edit['name'][$key], ($edit['sitedefault'] == $key), $edit['enabled'][$key], $key);
+ db_query("UPDATE {locales_meta} SET name = '%s', isdefault = %d, enabled = %d WHERE locale = '%s'", $edit['name'][$key], ($edit['sitedefault'] == $key), isset($edit['enabled'][$key]), $key);
}
}
diff --git a/modules/system.module b/modules/system.module
index 59fb1b4ba..2f3a41385 100644
--- a/modules/system.module
+++ b/modules/system.module
@@ -198,8 +198,8 @@ function system_user($type, $edit, &$user, $category = NULL) {
if (variable_get('configurable_timezones', 1)) {
$zones = _system_zonelist();
- $form['locale'] = array('#type'=>'item', '#title' => t('Locale settings'), '#weight' => 6);
- $form['locale']['timezone'] = array(
+ $form['timezone'] = array('#type'=>'fieldset', '#title' => t('Locale settings'), '#weight' => 6);
+ $form['timezone']['timezone'] = array(
'#type' => 'select', '#title' => t('Time zone'), '#default_value' => strlen($edit['timezone']) ? $edit['timezone'] : variable_get('date_default_timezone', 0),
'#options' => $zones, '#description' => t('Select your current local time. Dates and times throughout this site will be displayed using this time zone.')
);
diff --git a/modules/system/system.module b/modules/system/system.module
index 59fb1b4ba..2f3a41385 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -198,8 +198,8 @@ function system_user($type, $edit, &$user, $category = NULL) {
if (variable_get('configurable_timezones', 1)) {
$zones = _system_zonelist();
- $form['locale'] = array('#type'=>'item', '#title' => t('Locale settings'), '#weight' => 6);
- $form['locale']['timezone'] = array(
+ $form['timezone'] = array('#type'=>'fieldset', '#title' => t('Locale settings'), '#weight' => 6);
+ $form['timezone']['timezone'] = array(
'#type' => 'select', '#title' => t('Time zone'), '#default_value' => strlen($edit['timezone']) ? $edit['timezone'] : variable_get('date_default_timezone', 0),
'#options' => $zones, '#description' => t('Select your current local time. Dates and times throughout this site will be displayed using this time zone.')
);