makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-29 06:38:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed bug #486207

Browse source 
git-svn-id: file:///svn/phpbb/trunk@1474 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Paul S. Owen 2001-11-29 11:25:04 +00:00
parent 2b6be29f24
commit 1935343a15
3 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
phpBB/admin/admin_users.php
View file

@ -335,10 +335,18 @@ if( $mode == "edit" || $mode == "save" && ( isset($HTTP_POST_VARS['username']) |
{ {
$user_id = ( isset($HTTP_POST_VARS[POST_USERS_URL]) ) ? $HTTP_POST_VARS[POST_USERS_URL] : $HTTP_GET_VARS[POST_USERS_URL]; $user_id = ( isset($HTTP_POST_VARS[POST_USERS_URL]) ) ? $HTTP_POST_VARS[POST_USERS_URL] : $HTTP_GET_VARS[POST_USERS_URL];
$this_userdata = get_userdata_from_id($user_id); $this_userdata = get_userdata_from_id($user_id);
if( !$this_userdata )
{
message_die(GENERAL_MESSAGE, $lang['No_user_id_specified']);
}
} }
else else
{ {
$this_userdata = get_userdata($HTTP_POST_VARS['username']); $this_userdata = get_userdata($HTTP_POST_VARS['username']);
if( !$this_userdata )
{
message_die(GENERAL_MESSAGE, $lang['No_user_id_specified']);
}
} }
// //
@ -551,8 +559,6 @@ else
// //
// Default user selection box // Default user selection box
// //
// This should be altered on the final system
//
$sql = "SELECT user_id, username $sql = "SELECT user_id, username
FROM " . USERS_TABLE . " FROM " . USERS_TABLE . "
WHERE user_id <> " . ANONYMOUS ." WHERE user_id <> " . ANONYMOUS ."

4
phpBB/includes/functions.php
View file

@ -84,7 +84,7 @@ function get_userdata_from_id($userid)
if( !$db->sql_numrows($result) ) if( !$db->sql_numrows($result) )
{ {
message_die(GENERAL_ERROR, "No userdata for this user_id", "", __LINE__, __FILE__, $sql); return false;
} }
$row = $db->sql_fetchrow($result); $row = $db->sql_fetchrow($result);
@ -108,7 +108,7 @@ function get_userdata($username) {
if( !$db->sql_numrows($result) ) if( !$db->sql_numrows($result) )
{ {
message_die(GENERAL_ERROR, "Tried obtaining data for a non-existent user", "", __LINE__, __FILE__, $sql); return false;
} }
$row = $db->sql_fetchrow($result); $row = $db->sql_fetchrow($result);

4
phpBB/language/lang_english/lang_admin.php
View file

@ -349,7 +349,7 @@ $lang['Edit_Category_explain'] = "Use this form to modify a categories name.";
$lang['Forums_updated'] = "Forum and Category information updated successfully"; $lang['Forums_updated'] = "Forum and Category information updated successfully";
$lang['Click_return_forumadmin'] = "Click %sHere%s to return to Forum Administration"; $lang['Click_return_forumadmin'] = "Click %sHere%s to return to Forum Administration";
$lang['Must_delete_forums'] = "You need to delete all forums before you can delete this category";
// //
// Smiley Management // Smiley Management
@ -393,7 +393,7 @@ $lang['User_admin_explain'] = "Here you can change your user's information and c
$lang['Look_up_user'] = "Look up user"; $lang['Look_up_user'] = "Look up user";
$lang['Admin_user_fail'] = "Couldn't update the user's profile."; $lang['Admin_user_fail'] = "Couldn't update the users profile.";
$lang['Admin_user_updated'] = "The user's profile was successfully updated."; $lang['Admin_user_updated'] = "The user's profile was successfully updated.";
$lang['Click_return_useradmin'] = "Click %sHere%s to return to User Administration"; $lang['Click_return_useradmin'] = "Click %sHere%s to return to User Administration";