aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/session.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2007-10-09 15:11:06 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2007-10-09 15:11:06 +0000
commit96617d8902441ba68d97637e4dbe3e079dc13fdf (patch)
treeff80f3d3ed8ff1ae0b7002fb88474423279b0dff /phpBB/includes/session.php
parentea9c1d7ea9fce82cc3b7a87b52d1c3005927a26d (diff)
downloadforums-96617d8902441ba68d97637e4dbe3e079dc13fdf.tar
forums-96617d8902441ba68d97637e4dbe3e079dc13fdf.tar.gz
forums-96617d8902441ba68d97637e4dbe3e079dc13fdf.tar.bz2
forums-96617d8902441ba68d97637e4dbe3e079dc13fdf.tar.xz
forums-96617d8902441ba68d97637e4dbe3e079dc13fdf.zip
use previous information gathered for obtaining the ban type (bug #14674)
git-svn-id: file:///svn/phpbb/trunk@8157 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/session.php')
-rw-r--r--phpBB/includes/session.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php
index 0d59bf8faf..6ddc97fff8 100644
--- a/phpBB/includes/session.php
+++ b/phpBB/includes/session.php
@@ -985,7 +985,7 @@ class session
{
$ban_triggered_by = 'user';
}
- else if (!empty($row['ban_ip']) && preg_match('#^' . str_replace('\*', '.*?', preg_quote($row['ban_ip'], '#')) . '$#i', $user_ips))
+ else if ($ip_banned)
{
$ban_triggered_by = 'ip';
}