diff options
| author | Madhura Jayaratne <madhura.cj@gmail.com> | 2012-04-13 21:03:43 +0400 |
|---|---|---|
| committer | Madhura Jayaratne <madhura.cj@gmail.com> | 2012-04-13 21:03:43 +0400 |
| commit | ba215460083678f047c0ef7d19121d250b21e266 (patch) | |
| tree | 8698eaaa1d1c473f1beaa2a63d816b063e088bd3 /server_status.php | |
| parent | 6b2a502de712bb0a656f1c42968d123180874732 (diff) | |
| parent | 7e00134398237d69e2a4367d5b27870047dae7b3 (diff) | |
Merge branch 'master' of github.com:phpmyadmin/phpmyadmin
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 4c6c8ec589..3f3675890d 100644 --- a/server_status.php +++ b/server_status.php @@ -430,7 +430,10 @@ if (PMA_DRIZZLE) { * JS Includes */ +// needed to decide whether to load codemirror.js in server_status.js +PMA_AddJSVar('cfg_CodemirrorEnable', $GLOBALS['cfg']['CodemirrorEnable'] ? 1 : 0); $GLOBALS['js_include'][] = 'server_status.js'; + $GLOBALS['js_include'][] = 'jquery/jquery.tablesorter.js'; $GLOBALS['js_include'][] = 'jquery/jquery.cookie.js'; // For tab persistence // Charting |