aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions_user.php
diff options
context:
space:
mode:
authorrubencm <rubencm@gmail.com>2019-10-24 20:03:32 +0000
committerrubencm <rubencm@gmail.com>2019-11-01 10:30:41 +0000
commitb6a99e7dcad10836cd2277ba2bd9a6c19afe90f1 (patch)
tree7e2292e84aa12d68424a0f945fd2d1330bc0e467 /phpBB/includes/functions_user.php
parentf09f5bc51c15eef526374105d6443270dc1172bf (diff)
downloadforums-b6a99e7dcad10836cd2277ba2bd9a6c19afe90f1.tar
forums-b6a99e7dcad10836cd2277ba2bd9a6c19afe90f1.tar.gz
forums-b6a99e7dcad10836cd2277ba2bd9a6c19afe90f1.tar.bz2
forums-b6a99e7dcad10836cd2277ba2bd9a6c19afe90f1.tar.xz
forums-b6a99e7dcad10836cd2277ba2bd9a6c19afe90f1.zip
[ticket/16188] Remove some legacy code and fix bug
PHPBB3-16189
Diffstat (limited to 'phpBB/includes/functions_user.php')
-rw-r--r--phpBB/includes/functions_user.php7
1 files changed, 1 insertions, 6 deletions
diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php
index 7dd850111e..5c94a90d9d 100644
--- a/phpBB/includes/functions_user.php
+++ b/phpBB/includes/functions_user.php
@@ -1455,12 +1455,7 @@ function user_unban($mode, $ban)
*/
function user_ipwhois($ip)
{
- if (empty($ip))
- {
- return '';
- }
-
- if (!preg_match(get_preg_expression('ipv4'), $ip) && !preg_match(get_preg_expression('ipv6'), $ip))
+ if (!filter_var($ip, FILTER_VALIDATE_IP))
{
return '';
}