diff options
| author | Marc Delisle <marc@infomarc.info> | 2012-05-24 20:34:15 +0400 |
|---|---|---|
| committer | Marc Delisle <marc@infomarc.info> | 2012-05-24 20:34:15 +0400 |
| commit | 5c53fb643a16c8587c797bb0e2ec61bfe38e29af (patch) | |
| tree | f232da81ad7f26b57b73429c24f4517cd7800abc /server_status.php | |
| parent | 936f2efb7406f178f4906273f8667c53b0370091 (diff) | |
| parent | 376579c517600bc6c73c2c5a3952e4c1a899626f (diff) | |
Fix merge conflicts
Diffstat (limited to 'server_status.php')
| -rw-r--r-- | server_status.php | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/server_status.php b/server_status.php index f068bbad87..fee81f034b 100644 --- a/server_status.php +++ b/server_status.php @@ -443,6 +443,9 @@ if (PMA_USR_BROWSER_AGENT == 'IE' && PMA_USR_BROWSER_VER < 9) { $GLOBALS['js_include'][] = 'canvg/flashcanvas.js'; } $GLOBALS['js_include'][] = 'canvg/canvg.js'; +// for profiling chart +$GLOBALS['js_include'][] = 'jqplot/jquery.jqplot.js'; +$GLOBALS['js_include'][] = 'jqplot/plugins/jqplot.pieRenderer.js'; /** * flush status variables if requested |