summaryrefslogtreecommitdiff
path: root/modules/user.module
diff options
context:
space:
mode:
Diffstat (limited to 'modules/user.module')
-rw-r--r--modules/user.module6
1 files changed, 1 insertions, 5 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):