From dfd66f998d9f00a312f8e903c191a5b5dc7ad87c Mon Sep 17 00:00:00 2001
From: Kjartan Mannes <kjartan@2.no-reply.drupal.org>
Date: Thu, 29 Apr 2004 23:27:15 +0000
Subject: [PATCH] - Fixed sitewide timezone settings not being saved. - Making
sure profile fields are saved properly.
---
modules/locale.module | 2 +-
modules/locale/locale.module | 2 +-
modules/profile.module | 1 +
modules/profile/profile.module | 1 +
modules/system.module | 8 ++++----
modules/system/system.module | 8 ++++----
modules/user.module | 1 -
modules/user/user.module | 1 -
8 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/modules/locale.module b/modules/locale.module
index a86ad5d654a5..1835fd0b0009 100644
--- a/modules/locale.module
+++ b/modules/locale.module
@@ -75,7 +75,7 @@ function locale_link($type) {
function locale_user($type, &$edit, &$user) {
global $languages;
- if ($type == 'edit' && count($languages) > 1) {
+ if ($type == 'form' && count($languages) > 1) {
return array(t('Locale settings') => form_radios(t("Language"), 'language', $user->language, $languages, t("Selecting a different language will change the language of the site.")));
}
}
diff --git a/modules/locale/locale.module b/modules/locale/locale.module
index a86ad5d654a5..1835fd0b0009 100644
--- a/modules/locale/locale.module
+++ b/modules/locale/locale.module
@@ -75,7 +75,7 @@ function locale_link($type) {
function locale_user($type, &$edit, &$user) {
global $languages;
- if ($type == 'edit' && count($languages) > 1) {
+ if ($type == 'form' && count($languages) > 1) {
return array(t('Locale settings') => form_radios(t("Language"), 'language', $user->language, $languages, t("Selecting a different language will change the language of the site.")));
}
}
diff --git a/modules/profile.module b/modules/profile.module
index 29a528cffaea..0334445c84c6 100644
--- a/modules/profile.module
+++ b/modules/profile.module
@@ -199,6 +199,7 @@ function profile_user($type, $edit, &$user) {
case 'load':
return profile_load_profile($user);
case 'update':
+ case 'insert':
return profile_save_profile($edit, $user);
case 'view':
return profile_view_profile($user);
diff --git a/modules/profile/profile.module b/modules/profile/profile.module
index 29a528cffaea..0334445c84c6 100644
--- a/modules/profile/profile.module
+++ b/modules/profile/profile.module
@@ -199,6 +199,7 @@ function profile_user($type, $edit, &$user) {
case 'load':
return profile_load_profile($user);
case 'update':
+ case 'insert':
return profile_save_profile($edit, $user);
case 'view':
return profile_view_profile($user);
diff --git a/modules/system.module b/modules/system.module
index 9d1736dbce2b..e674bf979818 100644
--- a/modules/system.module
+++ b/modules/system.module
@@ -79,7 +79,7 @@ function system_link($type) {
}
function system_user($type, $edit, &$user) {
- if ($type == 'edit') {
+ if ($type == 'form') {
$options = "<option value=\"\">". t("Default theme") ."</option>\n";
if (count($themes = list_themes()) > 1) {
foreach ($themes as $key => $value) {
@@ -88,7 +88,7 @@ function system_user($type, $edit, &$user) {
$data[t('Theme settings')] = form_item(t("Theme"), "<select name=\"edit[theme]\">$options</select>", t("Selecting a different theme will change the look and feel of the site."));
}
- if (variable_get("sitewide_timezone", 0)) {
+ if (!variable_get("sitewide_timezone", 0)) {
$timestamp = time();
$zonelist = array(-11, -10, -9.5, -9, -8, -7, -6, -5, -4, -3.5, -3, -2, -1, 0, 1, 2, 3, 3.5, 4, 5, 5.5, 5.75, 6, 6.5, 7, 8, 9, 9.5, 10, 10.5, 11, 11.5, 12, 12.75, 13, 14);
foreach ($zonelist as $offset) {
@@ -96,8 +96,8 @@ function system_user($type, $edit, &$user) {
$zones[$zone] = format_date($timestamp, 'custom', variable_get('date_format_long', 'l, F j, Y - H:i') . ' O', $zone);
}
$data[t('Locale settings')] = form_select(t("Time zone"), "timezone", $edit["timezone"], $zones, t("Select what time you currently have and your time zone settings will be set appropriate."));
- return $data;
}
+ return $data;
}
else if ($type == 'view') {
// do nothing
@@ -173,7 +173,7 @@ function system_view_general() {
}
$group = form_select(t("Time zone"), "date_default_timezone", variable_get('date_default_timezone', 0), $zones, t("Select the default site timezone."));
- $group .= form_radios(t("Use sitewide timezone"), "sitewide timezone", variable_get("sitewide_timezone", 0), array(t("Disabled"), t("Enabled")), t("Enable or disable the sidewide timezone feature. Disabled means that users could choose their own timezone."));
+ $group .= form_radios(t("Use sitewide timezone"), "sitewide_timezone", variable_get("sitewide_timezone", 0), array(t("Disabled"), t("Enabled")), t("Enable or disable the sidewide timezone feature. Disabled means that users could choose their own timezone."));
$group .= form_select(t("Date format (short)"), "date_format_short", variable_get("date_format_short", $dateshort[0]), $dateshortchoices, t("The short format of date display."));
$group .= form_select(t("Date format (medium)"), "date_format_medium", variable_get("date_format_medium", $datemedium[0]), $datemediumchoices, t("The medium sized date display."));
$group .= form_select(t("Date format (long)"), "date_format_long", variable_get("date_format_long", $datelong[0]), $datelongchoices, t("Longer date format used for detailed display."));
diff --git a/modules/system/system.module b/modules/system/system.module
index 9d1736dbce2b..e674bf979818 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -79,7 +79,7 @@ function system_link($type) {
}
function system_user($type, $edit, &$user) {
- if ($type == 'edit') {
+ if ($type == 'form') {
$options = "<option value=\"\">". t("Default theme") ."</option>\n";
if (count($themes = list_themes()) > 1) {
foreach ($themes as $key => $value) {
@@ -88,7 +88,7 @@ function system_user($type, $edit, &$user) {
$data[t('Theme settings')] = form_item(t("Theme"), "<select name=\"edit[theme]\">$options</select>", t("Selecting a different theme will change the look and feel of the site."));
}
- if (variable_get("sitewide_timezone", 0)) {
+ if (!variable_get("sitewide_timezone", 0)) {
$timestamp = time();
$zonelist = array(-11, -10, -9.5, -9, -8, -7, -6, -5, -4, -3.5, -3, -2, -1, 0, 1, 2, 3, 3.5, 4, 5, 5.5, 5.75, 6, 6.5, 7, 8, 9, 9.5, 10, 10.5, 11, 11.5, 12, 12.75, 13, 14);
foreach ($zonelist as $offset) {
@@ -96,8 +96,8 @@ function system_user($type, $edit, &$user) {
$zones[$zone] = format_date($timestamp, 'custom', variable_get('date_format_long', 'l, F j, Y - H:i') . ' O', $zone);
}
$data[t('Locale settings')] = form_select(t("Time zone"), "timezone", $edit["timezone"], $zones, t("Select what time you currently have and your time zone settings will be set appropriate."));
- return $data;
}
+ return $data;
}
else if ($type == 'view') {
// do nothing
@@ -173,7 +173,7 @@ function system_view_general() {
}
$group = form_select(t("Time zone"), "date_default_timezone", variable_get('date_default_timezone', 0), $zones, t("Select the default site timezone."));
- $group .= form_radios(t("Use sitewide timezone"), "sitewide timezone", variable_get("sitewide_timezone", 0), array(t("Disabled"), t("Enabled")), t("Enable or disable the sidewide timezone feature. Disabled means that users could choose their own timezone."));
+ $group .= form_radios(t("Use sitewide timezone"), "sitewide_timezone", variable_get("sitewide_timezone", 0), array(t("Disabled"), t("Enabled")), t("Enable or disable the sidewide timezone feature. Disabled means that users could choose their own timezone."));
$group .= form_select(t("Date format (short)"), "date_format_short", variable_get("date_format_short", $dateshort[0]), $dateshortchoices, t("The short format of date display."));
$group .= form_select(t("Date format (medium)"), "date_format_medium", variable_get("date_format_medium", $datemedium[0]), $datemediumchoices, t("The medium sized date display."));
$group .= form_select(t("Date format (long)"), "date_format_long", variable_get("date_format_long", $datelong[0]), $datelongchoices, t("Longer date format used for detailed display."));
diff --git a/modules/user.module b/modules/user.module
index 51b31d817fd9..87429db67ee2 100644
--- a/modules/user.module
+++ b/modules/user.module
@@ -1120,7 +1120,6 @@ function _user_profile($edit, $account) {
}
}
}
-
$output = '';
foreach ($groups as $title => $form) {
$output .= form_group($title, $form);
diff --git a/modules/user/user.module b/modules/user/user.module
index 51b31d817fd9..87429db67ee2 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -1120,7 +1120,6 @@ function _user_profile($edit, $account) {
}
}
}
-
$output = '';
foreach ($groups as $title => $form) {
$output .= form_group($title, $form);
--
GitLab