summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2001-10-09 21:46:55 +0000
committerDries Buytaert <dries@buytaert.net>2001-10-09 21:46:55 +0000
commitd62b6dedaa4f4228dc5f42f61009f8deadb097ce (patch)
tree9d5b4af48e297be7141bbf2ee0df848cb3bad314
parentf1932821bedfe603eb7a5a7c210e0a7e4c1b4157 (diff)
downloadbrdo-d62b6dedaa4f4228dc5f42f61009f8deadb097ce.tar.gz
brdo-d62b6dedaa4f4228dc5f42f61009f8deadb097ce.tar.bz2
- fixed problem with language setting not being saved: patch by Axel
-rw-r--r--modules/user.module6
-rw-r--r--modules/user/user.module6
2 files changed, 2 insertions, 10 deletions
diff --git a/modules/user.module b/modules/user.module
index bd2748910..2f4a13241 100644
--- a/modules/user.module
+++ b/modules/user.module
@@ -457,10 +457,6 @@ function user_login($edit = array()) {
$user = user_load(array("name" => $name, "pass" => $pass, "status" => 1));
}
-print "user = $user->uid, $user->name<br />";
-
-die("foo");
-
/*
** Try to log on the user through Drupal:
*/
@@ -695,7 +691,7 @@ function user_edit($edit = array()) {
** Save user information:
*/
- $user = user_save($user, array("name" => $edit["name"], "mail" => $edit["mail"], "jabber" => $edit["jabber"], "theme" => $edit["theme"], "timezone" => $edit["timezone"], "homepage" => $edit["homepage"], "signature" => $edit["signature"]));
+ $user = user_save($user, array("name" => $edit["name"], "mail" => $edit["mail"], "jabber" => $edit["jabber"], "theme" => $edit["theme"], "timezone" => $edit["timezone"], "homepage" => $edit["homepage"], "signature" => $edit["signature"], "language" => $edit["language"]));
/*
** Save new password (if required):
diff --git a/modules/user/user.module b/modules/user/user.module
index bd2748910..2f4a13241 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -457,10 +457,6 @@ function user_login($edit = array()) {
$user = user_load(array("name" => $name, "pass" => $pass, "status" => 1));
}
-print "user = $user->uid, $user->name<br />";
-
-die("foo");
-
/*
** Try to log on the user through Drupal:
*/
@@ -695,7 +691,7 @@ function user_edit($edit = array()) {
** Save user information:
*/
- $user = user_save($user, array("name" => $edit["name"], "mail" => $edit["mail"], "jabber" => $edit["jabber"], "theme" => $edit["theme"], "timezone" => $edit["timezone"], "homepage" => $edit["homepage"], "signature" => $edit["signature"]));
+ $user = user_save($user, array("name" => $edit["name"], "mail" => $edit["mail"], "jabber" => $edit["jabber"], "theme" => $edit["theme"], "timezone" => $edit["timezone"], "homepage" => $edit["homepage"], "signature" => $edit["signature"], "language" => $edit["language"]));
/*
** Save new password (if required):