From 0a7e98951b27e63fa94d28f4a836f7b55f4b9bd7 Mon Sep 17 00:00:00 2001
From: rubencm <rubencm@gmail.com>
Date: Thu, 24 Oct 2019 20:31:16 +0000
Subject: [PATCH] [ticket/16189] Update version

PHPBB3-16189
---
 phpBB/includes/functions.php               | 7 ++++---
 phpBB/includes/functions_compatibility.php | 4 ++--
 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)
 {