diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2009-06-13 12:40:15 +0000 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2009-06-13 12:40:15 +0000 |
| commit | 12de4efca49f8dea35d783db587696e37ef2355b (patch) | |
| tree | 07f4d76cdb50dc21869b05000429d35e4542d236 | |
| parent | 8c246032cc03ceceb8fcf24fe3802a1f8165de2f (diff) | |
| download | forums-12de4efca49f8dea35d783db587696e37ef2355b.tar forums-12de4efca49f8dea35d783db587696e37ef2355b.tar.gz forums-12de4efca49f8dea35d783db587696e37ef2355b.tar.bz2 forums-12de4efca49f8dea35d783db587696e37ef2355b.tar.xz forums-12de4efca49f8dea35d783db587696e37ef2355b.zip | |
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
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 1 | ||||
| -rw-r--r-- | phpBB/includes/ucp/ucp_zebra.php | 27 |
2 files changed, 16 insertions, 12 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 7cdaf0fec0..3b55791485 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -101,6 +101,7 @@ <li>[Fix] Also remove data from friend/foe table when deleting user. (Bug #45345 - Patch by nickvergessen)</li> <li>[Fix] Correctly hide skiplink in prosilver right-to-left mode. (Bug #45765 - Patch by prototech and bantu)</li> <li>[Fix] Fix dynamic config update routine error if firebird is used (Bug #46315)</li> + <li>[Fix] Allow friends/foes to be added and removed at the same time. (Bug #46255 - Patch by bantu)</li> <li>[Change] Change the data format of the default file ACM to be more secure from tampering and have better performance.</li> <li>[Change] Add index on log_time to the log table to prevent slowdown on boards with many log entries. (Bug #44665 - Patch by bantu)</li> <li>[Change] Template engine now permits to a limited extent variable includes.</li> 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) { |