Merge remote-tracking branch 'origin/master'

phpmyadmin · Apr 15, 2012 · a840509 · a840509
2 parents 3c37670 + 05699a7
commit a840509
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/tbl_replace.php b/tbl_replace.php
@@ -30,6 +30,11 @@
 // Needed for generation of Inline Edit anchors
 $GLOBALS['js_include'][] = 'sql.js';
 
+if ($GLOBALS['cfg']['CodemirrorEnable']) {
+    $GLOBALS['js_include'][] = 'codemirror/lib/codemirror.js';
+    $GLOBALS['js_include'][] = 'codemirror/mode/mysql/mysql.js';
+}
+
 if (isset($_REQUEST['insert_rows'])
     && is_numeric($_REQUEST['insert_rows'])
     && $_REQUEST['insert_rows'] != $cfg['InsertRows']