mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-12 11:40:26 +01:00
Code Issues Releases Wiki Activity

Fix bug #40205 - Wrong message shown to user, when adding bots to friends/foes

Browse Source 
Authorised by: acydburn

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9597 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Joas Schilling 2009-06-16 14:06:56 +00:00
parent ef28393fd4
commit d8b0f2f310
3 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
phpBB/docs/CHANGELOG.html
View File

@ -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>

4
phpBB/includes/ucp/ucp_zebra.php
View File

@ -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'];

2
phpBB/language/en/ucp.php
View File

@ -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',