From 3de88162ff628a50d220d559954362c21028cc65 Mon Sep 17 00:00:00 2001 From: Hugues Peccatte Date: Sun, 28 Sep 2014 20:53:01 +0200 Subject: Replace PMA_String uses by mb_* calls. Remove part of unused variables. Signed-off-by: Hugues Peccatte --- index.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'index.php') 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 . '-', '-') ) ) ), -- cgit v1.2.3 From e20510de39695bdaf66cf8b57390a86f03505340 Mon Sep 17 00:00:00 2001 From: Hugues Peccatte Date: Fri, 3 Oct 2014 22:31:03 +0200 Subject: Replace mb functions by standard string functions. Signed-off-by: Hugues Peccatte --- index.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'index.php') diff --git a/index.php b/index.php index 14de872bdb..95019984ff 100644 --- a/index.php +++ b/index.php @@ -563,7 +563,7 @@ if (isset($GLOBALS['dbi']) $_client_info = $GLOBALS['dbi']->getClientInfo(); if ($server > 0 && /*overload*/mb_strpos($_client_info, 'mysqlnd') === false - && /*overload*/mb_substr(PMA_MYSQL_CLIENT_API, 0, 3) != /*overload*/mb_substr( + && substr(PMA_MYSQL_CLIENT_API, 0, 3) != 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, - /*overload*/mb_substr( + substr( PMA_MYSQL_STR_VERSION, 0, - /*overload*/mb_strpos(PMA_MYSQL_STR_VERSION . '-', '-') + strpos(PMA_MYSQL_STR_VERSION . '-', '-') ) ) ), -- cgit v1.2.3 From 49ababac08dfc8e901c78eca97a95c0c83654613 Mon Sep 17 00:00:00 2001 From: Hugues Peccatte Date: Sat, 4 Oct 2014 10:09:06 +0200 Subject: Replace mb functions by standard string functions. Signed-off-by: Hugues Peccatte --- index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'index.php') diff --git a/index.php b/index.php index 95019984ff..0e90e75aae 100644 --- a/index.php +++ b/index.php @@ -563,7 +563,7 @@ if (isset($GLOBALS['dbi']) $_client_info = $GLOBALS['dbi']->getClientInfo(); if ($server > 0 && /*overload*/mb_strpos($_client_info, 'mysqlnd') === false - && substr(PMA_MYSQL_CLIENT_API, 0, 3) != mb_substr( + && substr(PMA_MYSQL_CLIENT_API, 0, 3) != substr( PMA_MYSQL_INT_VERSION, 0, 3 ) ) { -- cgit v1.2.3