aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2011-03-17 01:29:10 +0100
committerAndreas Fischer <bantu@phpbb.com>2011-04-19 13:22:48 +0200
commitfd805358592162cf05c8808caca0bdf788fb7088 (patch)
tree88964c90cac87a37fb32cee5c0076e1eef658277 /phpBB/includes
parentee6167879ecba11dea945f129c026ce0f3cf7514 (diff)
downloadforums-fd805358592162cf05c8808caca0bdf788fb7088.tar
forums-fd805358592162cf05c8808caca0bdf788fb7088.tar.gz
forums-fd805358592162cf05c8808caca0bdf788fb7088.tar.bz2
forums-fd805358592162cf05c8808caca0bdf788fb7088.tar.xz
forums-fd805358592162cf05c8808caca0bdf788fb7088.zip
[ticket/9802] Remove redundant character class definition from preg_replace.
PHPBB3-9802
Diffstat (limited to 'phpBB/includes')
-rw-r--r--phpBB/includes/session.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/session.php b/phpBB/includes/session.php
index 9ab53d38ab..e1e315035b 100644
--- a/phpBB/includes/session.php
+++ b/phpBB/includes/session.php
@@ -221,7 +221,7 @@ class session
// if the forwarded for header shall be checked we have to validate its contents
if ($config['forwarded_for_check'])
{
- $this->forwarded_for = preg_replace('#[ ]{2,}#', ' ', str_replace(',', ' ', $this->forwarded_for));
+ $this->forwarded_for = preg_replace('# {2,}#', ' ', str_replace(',', ' ', $this->forwarded_for));
// split the list of IPs
$ips = explode(' ', $this->forwarded_for);
@@ -268,7 +268,7 @@ class session
// Why no forwarded_for et al? Well, too easily spoofed. With the results of my recent requests
// it's pretty clear that in the majority of cases you'll at least be left with a proxy/cache ip.
$this->ip = (!empty($_SERVER['REMOTE_ADDR'])) ? htmlspecialchars((string) $_SERVER['REMOTE_ADDR']) : '';
- $this->ip = preg_replace('#[ ]{2,}#', ' ', str_replace(',', ' ', $this->ip));
+ $this->ip = preg_replace('# {2,}#', ' ', str_replace(',', ' ', $this->ip));
// split the list of IPs
$ips = explode(' ', $this->ip);