diff --git a/phpBB/admin/admin_users.php b/phpBB/admin/admin_users.php index 63bbc8630f..7cb24cee54 100644 --- a/phpBB/admin/admin_users.php +++ b/phpBB/admin/admin_users.php @@ -654,7 +654,7 @@ else if($HTTP_POST_VARS[submit] && $HTTP_POST_VARS['user_id']) { $sql = "UPDATE " . USERS_TABLE . " SET " . $username_sql . $passwd_sql . "user_email = '$email', user_icq = '$icq', user_website = '$website', user_occ = '$occupation', user_from = '$location', user_interests = '$interests', user_sig = '$signature', user_viewemail = $viewemail, user_aim = '$aim', user_yim = '$yim', user_msnm = '$msn', user_attachsig = $attachsig, user_allowsmile = $allowsmilies, user_allowhtml = $allowhtml, user_allowbbcode = $allowbbcode, user_allow_viewonline = $allowviewonline, user_notify_pm = $notifypm, user_timezone = $user_timezone, user_dateformat = '$user_dateformat', user_lang = '$user_lang', user_active = '1', user_actkey = '$user_actkey'" . $avatar_sql . " - WHERE poster_id = $user_id"; + WHERE user_id = $user_id"; if($result = $db->sql_query($sql)) { $template->set_filenames(array( diff --git a/phpBB/language/lang_english.php b/phpBB/language/lang_english.php index 2936de6622..a8b4c561df 100755 --- a/phpBB/language/lang_english.php +++ b/phpBB/language/lang_english.php @@ -781,7 +781,7 @@ $lang['Emotion'] = "Emotion"; // User Management $lang['User_admin'] = "Administration"; -$lang['User_admin_explain'] = "Here you can change your user's information. Do not abuse this power.
Deleting users is not provided here, nor is changing admin status.
Use the banning and user permission pages respectively."; +$lang['User_admin_explain'] = "Here you can change your user's information. Do not abuse this power. Changing admin status is not provided here. Use the user permission pages for this.
Developer To-Do:
Add support to modify /"invisible/" fields."; $lang['User_delete'] = "Delete this user"; $lang['User_delete_explain'] = "Click here to delete this user. This cannot be undone."; $lang['User_deleted'] = "User was successfully deleted.";