diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2015-06-21 21:53:03 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2015-06-21 21:53:03 +0200 |
| commit | 759eb2921596852bd595e2e4b02f40ca4b3f2dcf (patch) | |
| tree | 36c18a7803fcbb8c32645d23d98acff68fc0183a /phpBB/includes/functions_user.php | |
| parent | 4aba193131fdf2c94ccf1b73df1d9602d5b4f95a (diff) | |
| parent | abf98f92e632eaa130dcffb7829bdee1e5b516f1 (diff) | |
| download | forums-759eb2921596852bd595e2e4b02f40ca4b3f2dcf.tar forums-759eb2921596852bd595e2e4b02f40ca4b3f2dcf.tar.gz forums-759eb2921596852bd595e2e4b02f40ca4b3f2dcf.tar.bz2 forums-759eb2921596852bd595e2e4b02f40ca4b3f2dcf.tar.xz forums-759eb2921596852bd595e2e4b02f40ca4b3f2dcf.zip | |
Merge branch '3.1.x'
* 3.1.x:
[ticket/13948] Correctly forwarding to the RIR for whois feature
Diffstat (limited to 'phpBB/includes/functions_user.php')
| -rw-r--r-- | phpBB/includes/functions_user.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php index b0f58ba680..45263ad018 100644 --- a/phpBB/includes/functions_user.php +++ b/phpBB/includes/functions_user.php @@ -1420,7 +1420,7 @@ function user_ipwhois($ip) $match = array(); // Test for referrals from $whois_host to other whois databases, roll on rwhois - if (preg_match('#ReferralServer: whois://(.+)#im', $ipwhois, $match)) + if (preg_match('#ReferralServer:[\x20]*whois://(.+)#im', $ipwhois, $match)) { if (strpos($match[1], ':') !== false) { |