diff options
| author | dougk_ff7 <dougk_ff7@users.sourceforge.net> | 2001-08-13 22:14:11 +0000 |
|---|---|---|
| committer | dougk_ff7 <dougk_ff7@users.sourceforge.net> | 2001-08-13 22:14:11 +0000 |
| commit | fe77fae929ba7b4d304f9594295ad88e7f69b7ff (patch) | |
| tree | 42970f0866547214a8375c568b169b853939195e | |
| parent | 095fe734369cbc26fee08420184372e71f63c483 (diff) | |
| download | forums-fe77fae929ba7b4d304f9594295ad88e7f69b7ff.tar forums-fe77fae929ba7b4d304f9594295ad88e7f69b7ff.tar.gz forums-fe77fae929ba7b4d304f9594295ad88e7f69b7ff.tar.bz2 forums-fe77fae929ba7b4d304f9594295ad88e7f69b7ff.tar.xz forums-fe77fae929ba7b4d304f9594295ad88e7f69b7ff.zip | |
Quick bugfixes.
git-svn-id: file:///svn/phpbb/trunk@860 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/admin/admin_users.php | 2 | ||||
| -rwxr-xr-x | phpBB/language/lang_english.php | 2 |
2 files changed, 2 insertions, 2 deletions
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.<br />Deleting users is not provided here, nor is changing admin status. <br />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. <br />Developer To-Do: <br />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."; |