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-10-30 19:40:09 +0300
committerHugues Peccatte <hugues.peccatte@gmail.com>2014-10-30 19:40:09 +0300
commite17de11c7438aef5e9f0773fcebda186e5648846 (patch)
tree5beebecb25ec01824060014db5103d71404bf95f /index.php
parent5007cdbf5eb259f5988b57d45ae5b980495213b8 (diff)
parent3b3017d7aec9bc07a279b80ac39108d731575f46 (diff)
Improve multibytes string manipulation performances.
Review SQL import process. 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 4a38afb5a7..02452a8f41 100644
--- a/index.php
+++ b/index.php
@@ -561,8 +561,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
+ && substr(PMA_MYSQL_CLIENT_API, 0, 3) != substr(
PMA_MYSQL_INT_VERSION, 0, 3
)
) {
@@ -571,10 +571,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(
+ substr(
PMA_MYSQL_STR_VERSION,
0,
- $pmaString->strpos(PMA_MYSQL_STR_VERSION . '-', '-')
+ strpos(PMA_MYSQL_STR_VERSION . '-', '-')
)
)
),