1 files changed, 7 insertions, 13 deletions

diff --git a/libraries/ip_allow_deny.lib.php b/libraries/ip_allow_deny.lib.php
index 1fe7ad051d..0c84b833bc 100644
--- a/libraries/ip_allow_deny.lib.php
+++ b/libraries/ip_allow_deny.lib.php
@@ -65,11 +65,8 @@ function PMA_getIp()
  */
 function PMA_ipMaskTest($testRange, $ipToTest)
 {
-    /** @var PMA_String $pmaString */
-    $pmaString = $GLOBALS['PMA_String'];
-
-    if ($pmaString->strpos($testRange, ':') > -1
-        || $pmaString->strpos($ipToTest, ':') > -1
+    if (/*overload*/mb_strpos($testRange, ':') > -1
+        || /*overload*/mb_strpos($ipToTest, ':') > -1
     ) {
         // assume IPv6
         $result = PMA_ipv6MaskTest($testRange, $ipToTest);
@@ -181,15 +178,12 @@ function PMA_ipv6MaskTest($test_range, $ip_to_test)
 {
     $result = true;
 
-    /** @var PMA_String $pmaString */
-    $pmaString = $GLOBALS['PMA_String'];
-
     // convert to lowercase for easier comparison
-    $test_range = $pmaString->strtolower($test_range);
-    $ip_to_test = $pmaString->strtolower($ip_to_test);
+    $test_range = /*overload*/mb_strtolower($test_range);
+    $ip_to_test = /*overload*/mb_strtolower($ip_to_test);
 
-    $is_cidr = $pmaString->strpos($test_range, '/') > -1;
-    $is_range = $pmaString->strpos($test_range, '[') > -1;
+    $is_cidr = /*overload*/mb_strpos($test_range, '/') > -1;
+    $is_range = /*overload*/mb_strpos($test_range, '[') > -1;
     $is_single = ! $is_cidr && ! $is_range;
 
     $ip_hex = bin2hex(inet_pton($ip_to_test));
@@ -238,7 +232,7 @@ function PMA_ipv6MaskTest($test_range, $ip_to_test)
         $pos = 31;
         while ($flexbits > 0) {
             // Get the character at this position
-            $orig = $pmaString->substr($last_hex, $pos, 1);
+            $orig = /*overload*/mb_substr($last_hex, $pos, 1);
 
             // Convert it to an integer
             $origval = hexdec($orig);