1 files changed, 19 insertions, 42 deletions

diff --git a/libraries/gis/GIS_Linestring.class.php b/libraries/gis/GIS_Linestring.class.php
index edb6193b0c..eec9878ad6 100644
--- a/libraries/gis/GIS_Linestring.class.php
+++ b/libraries/gis/GIS_Linestring.class.php
@@ -55,16 +55,13 @@ class PMA_GIS_Linestring extends PMA_GIS_Geometry
      */
     public function scaleRow($spatial)
     {
-        /** @var PMA_String $pmaString */
-        $pmaString = $GLOBALS['PMA_String'];
-
         // Trim to remove leading 'LINESTRING(' and trailing ')'
-        $linesrting = $pmaString->substr(
+        $linestring = /*overload*/mb_substr(
             $spatial,
             11,
-            $pmaString->strlen($spatial) - 12
+            /*overload*/mb_strlen($spatial) - 12
         );
-        return $this->setMinMax($linesrting, array());
+        return $this->setMinMax($linestring, array());
     }
 
     /**
@@ -82,24 +79,18 @@ class PMA_GIS_Linestring extends PMA_GIS_Geometry
     public function prepareRowAsPng($spatial, $label, $line_color,
         $scale_data, $image
     ) {
-        /** @var PMA_String $pmaString */
-        $pmaString = $GLOBALS['PMA_String'];
-
         // allocate colors
         $black = imagecolorallocate($image, 0, 0, 0);
-        $red   = hexdec($pmaString->substr($line_color, 1, 2));
-        $green = hexdec($pmaString->substr($line_color, 3, 2));
-        $blue  = hexdec($pmaString->substr($line_color, 4, 2));
+        $red   = hexdec(/*overload*/mb_substr($line_color, 1, 2));
+        $green = hexdec(/*overload*/mb_substr($line_color, 3, 2));
+        $blue  = hexdec(/*overload*/mb_substr($line_color, 4, 2));
         $color = imagecolorallocate($image, $red, $green, $blue);
 
-        /** @var PMA_String $pmaString */
-        $pmaString = $GLOBALS['PMA_String'];
-
         // Trim to remove leading 'LINESTRING(' and trailing ')'
-        $linesrting = $pmaString->substr(
+        $linesrting = /*overload*/mb_substr(
             $spatial,
             11,
-            $pmaString->strlen($spatial) - 12
+            /*overload*/mb_strlen($spatial) - 12
         );
         $points_arr = $this->extractPoints($linesrting, $scale_data);
 
@@ -139,20 +130,17 @@ class PMA_GIS_Linestring extends PMA_GIS_Geometry
      */
     public function prepareRowAsPdf($spatial, $label, $line_color, $scale_data, $pdf)
     {
-        /** @var PMA_String $pmaString */
-        $pmaString = $GLOBALS['PMA_String'];
-
         // allocate colors
-        $red   = hexdec($pmaString->substr($line_color, 1, 2));
-        $green = hexdec($pmaString->substr($line_color, 3, 2));
-        $blue  = hexdec($pmaString->substr($line_color, 4, 2));
+        $red   = hexdec(/*overload*/mb_substr($line_color, 1, 2));
+        $green = hexdec(/*overload*/mb_substr($line_color, 3, 2));
+        $blue  = hexdec(/*overload*/mb_substr($line_color, 4, 2));
         $line  = array('width' => 1.5, 'color' => array($red, $green, $blue));
 
         // Trim to remove leading 'LINESTRING(' and trailing ')'
-        $linesrting = $pmaString->substr(
+        $linesrting = /*overload*/mb_substr(
             $spatial,
             11,
-            $pmaString->strlen($spatial) - 12
+            /*overload*/mb_strlen($spatial) - 12
         );
         $points_arr = $this->extractPoints($linesrting, $scale_data);
 
@@ -199,14 +187,11 @@ class PMA_GIS_Linestring extends PMA_GIS_Geometry
             'stroke-width'=> 2,
         );
 
-        /** @var PMA_String $pmaString */
-        $pmaString = $GLOBALS['PMA_String'];
-
         // Trim to remove leading 'LINESTRING(' and trailing ')'
-        $linesrting = $pmaString->substr(
+        $linesrting = /*overload*/mb_substr(
             $spatial,
             11,
-            $pmaString->strlen($spatial) - 12
+            /*overload*/mb_strlen($spatial) - 12
         );
         $points_arr = $this->extractPoints($linesrting, $scale_data);
 
@@ -249,14 +234,11 @@ class PMA_GIS_Linestring extends PMA_GIS_Geometry
         }
         $result = $this->getBoundsForOl($srid, $scale_data);
 
-        /** @var PMA_String $pmaString */
-        $pmaString = $GLOBALS['PMA_String'];
-
         // Trim to remove leading 'LINESTRING(' and trailing ')'
-        $linesrting = $pmaString->substr(
+        $linesrting = /*overload*/mb_substr(
             $spatial,
             11,
-            $pmaString->strlen($spatial) - 12
+            /*overload*/mb_strlen($spatial) - 12
         );
         $points_arr = $this->extractPoints($linesrting, null);
 
@@ -292,10 +274,8 @@ class PMA_GIS_Linestring extends PMA_GIS_Geometry
                 && trim($gis_data[$index]['LINESTRING'][$i]['y']) != '')
                 ? $gis_data[$index]['LINESTRING'][$i]['y'] : $empty) . ',';
         }
-        /** @var PMA_String $pmaString */
-        $pmaString = $GLOBALS['PMA_String'];
 
-        $wkt = $pmaString->substr($wkt, 0, $pmaString->strlen($wkt) - 1);
+        $wkt = /*overload*/mb_substr($wkt, 0, /*overload*/mb_strlen($wkt) - 1);
         $wkt .= ')';
         return $wkt;
     }
@@ -322,11 +302,8 @@ class PMA_GIS_Linestring extends PMA_GIS_Geometry
             $wkt = $value;
         }
 
-        /** @var PMA_String $pmaString */
-        $pmaString = $GLOBALS['PMA_String'];
-
         // Trim to remove leading 'LINESTRING(' and trailing ')'
-        $linestring = $pmaString->substr($wkt, 11, ($pmaString->strlen($wkt) - 12));
+        $linestring = /*overload*/mb_substr($wkt, 11, (/*overload*/mb_strlen($wkt) - 12));
         $points_arr = $this->extractPoints($linestring, null);
 
         $no_of_points = count($points_arr);