diff options
| author | Michal Čihař <michal@cihar.com> | 2014-03-19 15:28:43 +0400 |
|---|---|---|
| committer | Michal Čihař <michal@cihar.com> | 2014-03-19 15:33:46 +0400 |
| commit | 0d8f510c22a9d2fff4cef85c8b39615e4df91380 (patch) | |
| tree | 8800c0f4c442bf1515a9b8187b7308901145203f /js/server_status_monitor.js | |
| parent | 8316786c95ed354fa700377063e6f79ff193d551 (diff) | |
Use JSON parser from jQuery instead of JSON plugin
Signed-off-by: Michal Čihař <michal@cihar.com>
Diffstat (limited to 'js/server_status_monitor.js')
| -rw-r--r-- | js/server_status_monitor.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/server_status_monitor.js b/js/server_status_monitor.js index bbbdee4422..1047ce51e0 100644 --- a/js/server_status_monitor.js +++ b/js/server_status_monitor.js @@ -600,7 +600,7 @@ AJAX.registerOnload('server_status_monitor.js', function () { try { var data = $('body', $('iframe#monitorConfigUpload')[0].contentWindow.document).html(); // Chrome wraps around '<pre style="word-wrap: break-word; white-space: pre-wrap;">' to any text content -.- - json = $.secureEvalJSON(data.substring(data.indexOf("{"), data.lastIndexOf("}") + 1)); + json = $.parseJSON(data.substring(data.indexOf("{"), data.lastIndexOf("}") + 1)); } catch (err) { alert(PMA_messages.strFailedParsingConfig); $('#emptyDialog').dialog('close'); |