diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2009-06-16 14:06:56 +0000 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2009-06-16 14:06:56 +0000 |
| commit | d8b0f2f31074b83fffa613e93cf156fd913f74be (patch) | |
| tree | 8a375d01e36c7d09a1377049f11ef8fe0927a030 | |
| parent | ef28393fd4426e1f9dce824810ccb474f80d4988 (diff) | |
| download | forums-d8b0f2f31074b83fffa613e93cf156fd913f74be.tar forums-d8b0f2f31074b83fffa613e93cf156fd913f74be.tar.gz forums-d8b0f2f31074b83fffa613e93cf156fd913f74be.tar.bz2 forums-d8b0f2f31074b83fffa613e93cf156fd913f74be.tar.xz forums-d8b0f2f31074b83fffa613e93cf156fd913f74be.zip | |
Fix bug #40205 - Wrong message shown to user, when adding bots to friends/foes
Authorised by: acydburn
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9597 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 1 | ||||
| -rw-r--r-- | phpBB/includes/ucp/ucp_zebra.php | 4 | ||||
| -rw-r--r-- | phpBB/language/en/ucp.php | 2 |
3 files changed, 7 insertions, 0 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index be2c4e34dd..7bf4b3b9c0 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -107,6 +107,7 @@ <li>[Fix] Make view_log() more resilient to corrupt serialized data. (Bug #46545)</li> <li>[Fix] Show error if hostname lookup doesn't return a valid IP address when banning. (Bug #45585 - Patch by bantu)</li> <li>[Fix] Incorrect layout when loading PM-draft (Bug #38435 - Patch by nickvergessen)</li> + <li>[Fix] Wrong message shown to user, when adding bots to friends/foes. (Bug #40205 - Patch by nickvergessen)</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 50fcbed90e..5ed4db7520 100644 --- a/phpBB/includes/ucp/ucp_zebra.php +++ b/phpBB/includes/ucp/ucp_zebra.php @@ -136,6 +136,10 @@ class ucp_zebra { $user_id_ary[] = $row['user_id']; } + else if ($row['user_id'] != ANONYMOUS) + { + $error[] = $user->lang['NOT_ADDED_' . $l_mode . '_BOTS']; + } else { $error[] = $user->lang['NOT_ADDED_' . $l_mode . '_ANONYMOUS']; diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php index 594a1dbe4f..3cb4785301 100644 --- a/phpBB/language/en/ucp.php +++ b/phpBB/language/en/ucp.php @@ -273,10 +273,12 @@ $lang = array_merge($lang, array( 'NOTIFY_METHOD_IM' => 'Jabber only', 'NOTIFY_ON_PM' => 'Notify me on new private messages', 'NOT_ADDED_FRIENDS_ANONYMOUS' => 'You cannot add the anonymous user to your friends list.', + 'NOT_ADDED_FRIENDS_BOTS' => 'You cannot add bots to your friends list.', 'NOT_ADDED_FRIENDS_FOES' => 'You cannot add users to your friends list who are on your foes list.', 'NOT_ADDED_FRIENDS_SELF' => 'You cannot add yourself to the friends list.', 'NOT_ADDED_FOES_MOD_ADMIN' => 'You cannot add administrators and moderators to your foes list.', 'NOT_ADDED_FOES_ANONYMOUS' => 'You cannot add the anonymous user to your foes list.', + 'NOT_ADDED_FOES_BOTS' => 'You cannot add bots to your foes list.', 'NOT_ADDED_FOES_FRIENDS' => 'You cannot add users to your foes list who are on your friends list.', 'NOT_ADDED_FOES_SELF' => 'You cannot add yourself to the foes list.', 'NOT_AGREE' => 'I do not agree to these terms', |