aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorrubencm <rubencm@gmail.com>2019-10-24 20:31:16 +0000
committerrubencm <rubencm@gmail.com>2019-11-01 10:30:41 +0000
commit0a7e98951b27e63fa94d28f4a836f7b55f4b9bd7 (patch)
tree689b006413a5e21880f7b2fb090a5ddd92981db9 /phpBB
parentb6a99e7dcad10836cd2277ba2bd9a6c19afe90f1 (diff)
downloadforums-0a7e98951b27e63fa94d28f4a836f7b55f4b9bd7.tar
forums-0a7e98951b27e63fa94d28f4a836f7b55f4b9bd7.tar.gz
forums-0a7e98951b27e63fa94d28f4a836f7b55f4b9bd7.tar.bz2
forums-0a7e98951b27e63fa94d28f4a836f7b55f4b9bd7.tar.xz
forums-0a7e98951b27e63fa94d28f4a836f7b55f4b9bd7.zip
[ticket/16189] Update version
PHPBB3-16189
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/includes/functions.php7
-rw-r--r--phpBB/includes/functions_compatibility.php4
2 files changed, 6 insertions, 5 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index b2c7d6d6b1..d2d5b503a2 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -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);
}
}
diff --git a/phpBB/includes/functions_compatibility.php b/phpBB/includes/functions_compatibility.php
index e93523914f..1c9b26d8f3 100644
--- a/phpBB/includes/functions_compatibility.php
+++ b/phpBB/includes/functions_compatibility.php
@@ -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)
{