Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHugues Peccatte <hugues.peccatte@gmail.com>2014-09-28 22:53:01 +0400
committerHugues Peccatte <hugues.peccatte@gmail.com>2014-09-28 22:53:01 +0400
commit3de88162ff628a50d220d559954362c21028cc65 (patch)
treea467d672686ca88369e27b04964950b98928b64f /gis_data_editor.php
parent38eb5948a0e19991620b7d9c47c1dc0f284e291a (diff)
Replace PMA_String uses by mb_* calls.
Remove part of unused variables. Signed-off-by: Hugues Peccatte <hugues.peccatte@gmail.com>
Diffstat (limited to 'gis_data_editor.php')
-rw-r--r--gis_data_editor.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/gis_data_editor.php b/gis_data_editor.php
index 57add856c2..66a0814359 100644
--- a/gis_data_editor.php
+++ b/gis_data_editor.php
@@ -47,14 +47,14 @@ $pmaString = $GLOBALS['PMA_String'];
// Extract from field's values if available, if not use the column type passed.
if (! isset($gis_data['gis_type'])) {
if (isset($_REQUEST['type']) && $_REQUEST['type'] != '') {
- $gis_data['gis_type'] = $pmaString->strtoupper($_REQUEST['type']);
+ $gis_data['gis_type'] = /*overload*/mb_strtoupper($_REQUEST['type']);
}
if (isset($_REQUEST['value']) && trim($_REQUEST['value']) != '') {
- $start = ($pmaString->substr($_REQUEST['value'], 0, 1) == "'") ? 1 : 0;
- $gis_data['gis_type'] = $pmaString->substr(
+ $start = (/*overload*/mb_substr($_REQUEST['value'], 0, 1) == "'") ? 1 : 0;
+ $gis_data['gis_type'] = /*overload*/mb_substr(
$_REQUEST['value'],
$start,
- $pmaString->strpos($_REQUEST['value'], "(") - $start
+ /*overload*/mb_strpos($_REQUEST['value'], "(") - $start
);
}
if ((! isset($gis_data['gis_type']))