diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-03-25 12:35:23 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-03-25 12:35:23 +0000 |
| commit | f49a8147b71287695547794953940603dc57da35 (patch) | |
| tree | 92390dc76b1af4789887103513ab54a6affd739d /phpBB/includes/session.php | |
| parent | 5de37a5c0a9665ef7170c247a842d9cd38e9e1d3 (diff) | |
| download | forums-f49a8147b71287695547794953940603dc57da35.tar forums-f49a8147b71287695547794953940603dc57da35.tar.gz forums-f49a8147b71287695547794953940603dc57da35.tar.bz2 forums-f49a8147b71287695547794953940603dc57da35.tar.xz forums-f49a8147b71287695547794953940603dc57da35.zip | |
fix #1213
git-svn-id: file:///svn/phpbb/trunk@5710 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/session.php')
| -rw-r--r-- | phpBB/includes/session.php | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php index 25829d5186..8568d8f6db 100644 --- a/phpBB/includes/session.php +++ b/phpBB/includes/session.php @@ -247,8 +247,12 @@ class session $bot = $row['user_id']; } - if ($row['bot_ip'] && (!$row['bot_agent'] || !$bot)) + // If ip is supplied, we will make sure the ip is matching too... + if ($row['bot_ip'] && ($bot || !$row['bot_agent'])) { + // Set bot to false, then we only have to set it to true if it is matching + $bot = false; + foreach (explode(',', $row['bot_ip']) as $bot_ip) { if (strpos($this->ip, $bot_ip) === 0) |