diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/user.module | 5 | ||||
| -rw-r--r-- | modules/user/user.module | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/modules/user.module b/modules/user.module index 5129eb557..3c307043f 100644 --- a/modules/user.module +++ b/modules/user.module @@ -1013,6 +1013,7 @@ function user_edit($edit = array()) { $output .= form_submit(t("Save user information")); $output = form($output, "post", 0, "enctype=\"multipart/form-data\""); + // the "enctype" attribute is required to upload files such as avatars } else { $output = user_login(); @@ -1480,7 +1481,7 @@ function user_admin_edit($edit = array()) { unset($edit["pass1"], $edit["pass2"]); if (!$error) { - $account = user_save($account, $edit); + $account = user_save($account, array_merge($edit, $data)); $output .= status(t("your user information changes have been saved.")); } else { @@ -1527,7 +1528,7 @@ function user_admin_edit($edit = array()) { $output .= form_submit(t("Save account")); $output .= form_submit(t("Delete account")); - $output = form($output); + $output = form($output, "post", 0, "enctype=\"multipart/form-data\""); } else { diff --git a/modules/user/user.module b/modules/user/user.module index 5129eb557..3c307043f 100644 --- a/modules/user/user.module +++ b/modules/user/user.module @@ -1013,6 +1013,7 @@ function user_edit($edit = array()) { $output .= form_submit(t("Save user information")); $output = form($output, "post", 0, "enctype=\"multipart/form-data\""); + // the "enctype" attribute is required to upload files such as avatars } else { $output = user_login(); @@ -1480,7 +1481,7 @@ function user_admin_edit($edit = array()) { unset($edit["pass1"], $edit["pass2"]); if (!$error) { - $account = user_save($account, $edit); + $account = user_save($account, array_merge($edit, $data)); $output .= status(t("your user information changes have been saved.")); } else { @@ -1527,7 +1528,7 @@ function user_admin_edit($edit = array()) { $output .= form_submit(t("Save account")); $output .= form_submit(t("Delete account")); - $output = form($output); + $output = form($output, "post", 0, "enctype=\"multipart/form-data\""); } else { |