3 files changed, 2 insertions, 4 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index a8861274aa..6859931cf9 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -225,7 +225,6 @@ function discover_auth($user_id = false, $opts = false, $forum_id = false)
 		FROM ' . ACL_OPTIONS_TABLE . ' ao, ' . ACL_USERS_TABLE . ' a 
 		WHERE ao.auth_option_id = a.auth_option_id 
 			' . (($sql_user) ? 'AND a.' . $sql_user : '') . "
-			$sql_user 
 			$sql_forum 
 			$sql_opts 
 		ORDER BY a.forum_id, ao.auth_option";
@@ -243,7 +242,6 @@ function discover_auth($user_id = false, $opts = false, $forum_id = false)
 		WHERE ao.auth_option_id = a.auth_option_id 
 			AND a.group_id = ug.group_id
 			' . (($sql_user) ? 'AND ug.' . $sql_user : '') . "
-			$sql_users 
 			$sql_forum 
 			$sql_opts 
 		ORDER BY a.forum_id, ao.auth_option";
diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php
index eb4bf1ccc5..67dcdb0af1 100644
--- a/phpBB/includes/ucp/ucp_profile.php
+++ b/phpBB/includes/ucp/ucp_profile.php
@@ -136,7 +136,7 @@ class ucp_profile extends module
 									$messenger->assign_vars(array(
 										'USERNAME'		=> $row['username'],
 										'EMAIL_SIG'		=> str_replace('<br />', "\n", "-- \n" . $config['board_email_sig']),
-						
+
 										'U_ACTIVATE'	=> "$server_url/ucp.$phpEx?mode=activate&k=$user_actkey")
 									);
 
diff --git a/phpBB/includes/ucp/ucp_zebra.php b/phpBB/includes/ucp/ucp_zebra.php
index c435f9f70d..db0a5c8ca8 100644
--- a/phpBB/includes/ucp/ucp_zebra.php
+++ b/phpBB/includes/ucp/ucp_zebra.php
@@ -75,7 +75,7 @@ class ucp_zebra extends module
 
 				if ($add)
 				{
-					$sql = 'SELECT user_id, user_permissions   
+					$sql = 'SELECT user_id    
 						FROM ' . USERS_TABLE . ' 
 						WHERE username IN (' . $add . ')';
 					$result = $db->sql_query($sql);