3 files changed, 12 insertions, 6 deletions
diff --git a/phpBB/admin/admin_users.php b/phpBB/admin/admin_users.php
index 4134a0398d..fc2744b4fb 100644
--- a/phpBB/admin/admin_users.php
+++ b/phpBB/admin/admin_users.php
@@ -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];
 			$this_userdata = get_userdata_from_id($user_id);
+			if( !$this_userdata )
+			{
+				message_die(GENERAL_MESSAGE, $lang['No_user_id_specified']);
+			}
 		}
 		else
 		{
 			$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
 	//
-	// This should be altered on the final system
-	//
 	$sql = "SELECT user_id, username
 		FROM " . USERS_TABLE . "
 		WHERE user_id <> " . ANONYMOUS ."
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 188e77d1f5..b1c1f0b95f 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -84,7 +84,7 @@ function get_userdata_from_id($userid)
 
 	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);
@@ -108,7 +108,7 @@ function get_userdata($username) {
 
 	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);
diff --git a/phpBB/language/lang_english/lang_admin.php b/phpBB/language/lang_english/lang_admin.php
index a716423ae1..002f2d6b32 100644
--- a/phpBB/language/lang_english/lang_admin.php
+++ b/phpBB/language/lang_english/lang_admin.php
@@ -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['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
@@ -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['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['Click_return_useradmin'] = "Click %sHere%s to return to User Administration";