From bef2540d9ce3b429837c7e67c5f3f7f254aa1920 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Tue, 19 Apr 2011 13:46:00 +0200
Subject: [PATCH] [ticket/9802] Fix tiny logic bug in loop determining
 REMOTE_ADDR.

When $ip is empty() it was assigned to $this->ip.

PHPBB3-9802
---
 phpBB/includes/session.php | 4 ++--
 1 file 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;