aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/session.php
diff options
context:
space:
mode:
Diffstat (limited to 'phpBB/includes/session.php')
-rw-r--r--phpBB/includes/session.php6
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)