diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-04-19 13:46:00 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-04-19 13:46:00 +0200 |
| commit | bef2540d9ce3b429837c7e67c5f3f7f254aa1920 (patch) | |
| tree | aa86f1ab22f28dbcfa20e8038b64eb09e7040b51 /phpBB/includes/session.php | |
| parent | fd805358592162cf05c8808caca0bdf788fb7088 (diff) | |
| download | forums-bef2540d9ce3b429837c7e67c5f3f7f254aa1920.tar forums-bef2540d9ce3b429837c7e67c5f3f7f254aa1920.tar.gz forums-bef2540d9ce3b429837c7e67c5f3f7f254aa1920.tar.bz2 forums-bef2540d9ce3b429837c7e67c5f3f7f254aa1920.tar.xz forums-bef2540d9ce3b429837c7e67c5f3f7f254aa1920.zip | |
[ticket/9802] Fix tiny logic bug in loop determining REMOTE_ADDR.
When $ip is empty() it was assigned to $this->ip.
PHPBB3-9802
Diffstat (limited to 'phpBB/includes/session.php')
| -rw-r--r-- | phpBB/includes/session.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php index e1e315035b..f2aa47d84e 100644 --- a/phpBB/includes/session.php +++ b/phpBB/includes/session.php @@ -271,7 +271,7 @@ class session $this->ip = preg_replace('# {2,}#', ' ', str_replace(',', ' ', $this->ip)); // split the list of IPs - $ips = explode(' ', $this->ip); + $ips = explode(' ', trim($this->ip)); // Default IP if REMOTE_ADDR is invalid $this->ip = '127.0.0.1'; @@ -279,7 +279,7 @@ class session foreach ($ips as $ip) { // check IPv4 first, the IPv6 is hopefully only going to be used very seldomly - if (!empty($ip) && !preg_match(get_preg_expression('ipv4'), $ip) && !preg_match(get_preg_expression('ipv6'), $ip)) + if (!preg_match(get_preg_expression('ipv4'), $ip) && !preg_match(get_preg_expression('ipv6'), $ip)) { // Just break break; |