makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix wrong bot ip check if bot ip was wrongly entered by admin. (Bug #42485)

Browse source 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9374 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2009-03-16 16:34:16 +00:00
parent 3b918a234e
commit 3c5b06f8aa
2 changed files with 8 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

@ -117,6 +117,7 @@
<li>[Fix] Hide font size options which are bigger than the allowed size in the editor. (Bug #42615 - Patch by nickvergessen)</li> <li>[Fix] Hide font size options which are bigger than the allowed size in the editor. (Bug #42615 - Patch by nickvergessen)</li>
<li>[Fix] Better thumbnail quality with imagemagick. (Bug #42565)</li> <li>[Fix] Better thumbnail quality with imagemagick. (Bug #42565)</li>
<li>[Fix] Fix download count increments for image attachments without corresponding thumbnails. (Bug #42505)</li> <li>[Fix] Fix download count increments for image attachments without corresponding thumbnails. (Bug #42505)</li>
<li>[Fix] Fix wrong bot ip check if bot ip was wrongly entered by admin. (Bug #42485)</li>
<li>[Change] Allow download of conflicting file for later reference in automatic updater</li> <li>[Change] Allow download of conflicting file for later reference in automatic updater</li>
<li>[Change] Default difference view is now 'inline' instead of 'side by side'</li> <li>[Change] Default difference view is now 'inline' instead of 'side by side'</li>
<li>[Change] Added new option for merging differences to conflicting files in automatic updater</li> <li>[Change] Added new option for merging differences to conflicting files in automatic updater</li>

7
phpBB/includes/session.php
View file

@ -480,6 +480,13 @@ class session
foreach (explode(',', $row['bot_ip']) as $bot_ip) foreach (explode(',', $row['bot_ip']) as $bot_ip)
{ {
$bot_ip = trim($bot_ip);
if (!$bot_ip)
{
continue;
}
if (strpos($this->ip, $bot_ip) === 0) if (strpos($this->ip, $bot_ip) === 0)
{ {
$bot = (int) $row['user_id']; $bot = (int) $row['user_id'];