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:
authorDan Ungureanu <udan1107@gmail.com>2015-03-10 04:59:17 +0300
committerMadhura Jayaratne <madhura.cj@gmail.com>2015-03-10 04:59:17 +0300
commit102cd3c273bec5256dfe1503cf2203841446f9c8 (patch)
treec9581655be1666dfffaa4703256a0921070944d1 /js/tbl_zoom_plot_jqplot.js
parent8205498905c5107cace7f827c01fcef92de4c486 (diff)
BUG #4791. Zoom search: JavaScript error
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
Diffstat (limited to 'js/tbl_zoom_plot_jqplot.js')
-rw-r--r--js/tbl_zoom_plot_jqplot.js7
1 files changed, 6 insertions, 1 deletions
diff --git a/js/tbl_zoom_plot_jqplot.js b/js/tbl_zoom_plot_jqplot.js
index 2f44ebe1a9..36bfbaeb18 100644
--- a/js/tbl_zoom_plot_jqplot.js
+++ b/js/tbl_zoom_plot_jqplot.js
@@ -142,7 +142,12 @@ AJAX.registerOnload('tbl_zoom_plot_jqplot.js', function () {
// Get query result
- var searchedData = jQuery.parseJSON($('#querydata').html());
+ var searchedData;
+ try {
+ searchedData = jQuery.parseJSON($('#querydata').html());
+ } catch (err) {
+ searchedData = null;
+ }
/**
** Input form submit on field change