diff options
author | Marc Alexander <admin@m-a-styles.de> | 2019-11-01 22:01:26 +0100 |
---|---|---|
committer | Marc Alexander <admin@m-a-styles.de> | 2019-11-01 22:01:26 +0100 |
commit | 912eb28223c937a679bd2c78ea139033f7796b26 (patch) | |
tree | d7b119bb5627d0814a0177070bf12ba15c939f15 /phpBB/includes/functions_user.php | |
parent | ce35aa8b0b90870608a5b0782a36c6aedad8c7e4 (diff) | |
parent | 00682db8a625e40f720c513c72267395c4354766 (diff) | |
download | forums-912eb28223c937a679bd2c78ea139033f7796b26.tar forums-912eb28223c937a679bd2c78ea139033f7796b26.tar.gz forums-912eb28223c937a679bd2c78ea139033f7796b26.tar.bz2 forums-912eb28223c937a679bd2c78ea139033f7796b26.tar.xz forums-912eb28223c937a679bd2c78ea139033f7796b26.zip |
Merge pull request #5718 from rubencm/ticket/16189
[ticket/16189] Deprecate inet_ntop and inet_pton wrappers
Diffstat (limited to 'phpBB/includes/functions_user.php')
-rw-r--r-- | phpBB/includes/functions_user.php | 7 |
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 ''; } |