From 12de4efca49f8dea35d783db587696e37ef2355b Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Sat, 13 Jun 2009 12:40:15 +0000
Subject: Fix bug #46255 - Allow friends/foes to be added and removed at the
 same time. Authorised by: acydburn

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9577 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/ucp/ucp_zebra.php | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

(limited to 'phpBB/includes')

diff --git a/phpBB/includes/ucp/ucp_zebra.php b/phpBB/includes/ucp/ucp_zebra.php
index fb5df9394b..c853c47026 100644
--- a/phpBB/includes/ucp/ucp_zebra.php
+++ b/phpBB/includes/ucp/ucp_zebra.php
@@ -52,6 +52,21 @@ class ucp_zebra
 			{
 				if (confirm_box(true))
 				{
+					// Remove users
+					if (!empty($data['usernames']))
+					{
+						// Force integer values
+						$data['usernames'] = array_map('intval', $data['usernames']);
+
+						$sql = 'DELETE FROM ' . ZEBRA_TABLE . '
+							WHERE user_id = ' . $user->data['user_id'] . '
+								AND ' . $db->sql_in_set('zebra_id', $data['usernames']);
+						$db->sql_query($sql);
+
+						$updated = true;
+					}
+
+					// Add users
 					if ($data['add'])
 					{
 						$data['add'] = array_map('trim', array_map('utf8_clean_string', explode("\n", $data['add'])));
@@ -183,18 +198,6 @@ class ucp_zebra
 							}
 						}
 					}
-					else if (sizeof($data['usernames']))
-					{
-						// Force integer values
-						$data['usernames'] = array_map('intval', $data['usernames']);
-
-						$sql = 'DELETE FROM ' . ZEBRA_TABLE . '
-							WHERE user_id = ' . $user->data['user_id'] . '
-								AND ' . $db->sql_in_set('zebra_id', $data['usernames']);
-						$db->sql_query($sql);
-
-						$updated = true;
-					}
 
 					if ($updated)
 					{
-- 
cgit v1.2.1