gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/QA_4_6' into QA_4_6

Browse Source
This commit is contained in:
Weblate 2016-03-09 11:43:42 +01:00
commit b25885ee43
1 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
libraries/Response.php
View File

@ -364,7 +364,40 @@ class Response
// response correctly.
PMA_headerJSON();
echo json_encode($this->_JSON);
$result = json_encode($this->_JSON);
if ($result === false) {
switch (json_last_error()) {
case JSON_ERROR_NONE:
$error = 'No errors';
break;
case JSON_ERROR_DEPTH:
$error = 'Maximum stack depth exceeded';
break;
case JSON_ERROR_STATE_MISMATCH:
$error = 'Underflow or the modes mismatch';
break;
case JSON_ERROR_CTRL_CHAR:
$error = 'Unexpected control character found';
break;
case JSON_ERROR_SYNTAX:
$error = 'Syntax error, malformed JSON';
break;
case JSON_ERROR_UTF8:
$error = 'Malformed UTF-8 characters, possibly incorrectly encoded';
break;
default:
$error = 'Unknown error';
break;
}
echo json_encode(
array(
'success' => false,
'error' => 'JSON encoding failed: ' . $error,
)
);
} else {
echo $result;
}
}
/**