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:
Diffstat (limited to 'libraries/Response.class.php')
-rw-r--r--libraries/Response.class.php8
1 files changed, 6 insertions, 2 deletions
diff --git a/libraries/Response.class.php b/libraries/Response.class.php
index 7f60173e6f..09d51cff13 100644
--- a/libraries/Response.class.php
+++ b/libraries/Response.class.php
@@ -317,7 +317,11 @@ class PMA_Response
$this->addJSON('_selflink', $this->getFooter()->getSelfUrl('unencoded'));
$this->addJSON('_displayMessage', $this->getHeader()->getMessage());
$errors = $this->_footer->getErrorMessages();
- if (strlen($errors)) {
+
+ /** @var PMA_String $pmaString */
+ $pmaString = $GLOBALS['PMA_String'];
+
+ if ($pmaString->strlen($errors)) {
$this->addJSON('_errors', $errors);
}
$promptPhpErrors = $GLOBALS['error_handler']->hasErrorsForPrompt();
@@ -328,7 +332,7 @@ class PMA_Response
$query = '';
$maxChars = $GLOBALS['cfg']['MaxCharactersInDisplayedSQL'];
if (isset($GLOBALS['sql_query'])
- && strlen($GLOBALS['sql_query']) < $maxChars
+ && $pmaString->strlen($GLOBALS['sql_query']) < $maxChars
) {
$query = $GLOBALS['sql_query'];
}