mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-03-21 08:00:46 +01:00
Code Issues Releases Wiki Activity

[ticket/16189] Update version

Browse Source 
PHPBB3-16189
This commit is contained in:
rubencm 2019-10-24 20:31:16 +00:00
parent b6a99e7dca
commit 0a7e98951b
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
phpBB/includes/functions.php
View File

@ -2987,16 +2987,17 @@ function phpbb_ip_normalise(string $address)
{
$ip_normalised = false;
if(filter_var($address, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4))
if (filter_var($address, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4))
{
$ip_normalised = $address;
}
else if (filter_var($address, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6))
else if (filter_var($address, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6))
{
$ip_normalised = inet_ntop(inet_pton($address));
// If is ipv4
if(stripos($ip_normalised, '::ffff:') === 0) {
if (stripos($ip_normalised, '::ffff:') === 0)
{
$ip_normalised = substr($ip_normalised, 7);
}
}

4
phpBB/includes/functions_compatibility.php
View File

@ -635,7 +635,7 @@ function phpbb_checkdnsrr($host, $type = 'MX')
* @return mixed false on failure,
* string otherwise
*
* @deprecated 3.2.9 (To be removed: 4.0.0)
* @deprecated 3.3.0-b2 (To be removed: 4.0.0)
*/
function phpbb_inet_ntop($in_addr)
{
@ -706,7 +706,7 @@ function phpbb_inet_ntop($in_addr)
* @return mixed false if address is invalid,
* in_addr representation of the given address otherwise (string)
*
* @deprecated 3.2.9 (To be removed: 4.0.0)
* @deprecated 3.3.0-b2 (To be removed: 4.0.0)
*/
function phpbb_inet_pton($address)
{