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 /index.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 'index.php')
-rw-r--r--index.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/index.php b/index.php
index 42e03df39e..14de872bdb 100644
--- a/index.php
+++ b/index.php
@@ -562,8 +562,8 @@ if (isset($GLOBALS['dbi'])
$_client_info = $GLOBALS['dbi']->getClientInfo();
if ($server > 0
- && $pmaString->strpos($_client_info, 'mysqlnd') === false
- && $pmaString->substr(PMA_MYSQL_CLIENT_API, 0, 3) != $pmaString->substr(
+ && /*overload*/mb_strpos($_client_info, 'mysqlnd') === false
+ && /*overload*/mb_substr(PMA_MYSQL_CLIENT_API, 0, 3) != /*overload*/mb_substr(
PMA_MYSQL_INT_VERSION, 0, 3
)
) {
@@ -572,10 +572,10 @@ if (isset($GLOBALS['dbi'])
sprintf(
__('Your PHP MySQL library version %s differs from your MySQL server version %s. This may cause unpredictable behavior.'),
$_client_info,
- $pmaString->substr(
+ /*overload*/mb_substr(
PMA_MYSQL_STR_VERSION,
0,
- $pmaString->strpos(PMA_MYSQL_STR_VERSION . '-', '-')
+ /*overload*/mb_strpos(PMA_MYSQL_STR_VERSION . '-', '-')
)
)
),