Merge remote-tracking branch 'origin/master'

phpmyadmin · Aug 7, 2013 · 0bacbf7 · 0bacbf7
2 parents 5f47ef9 + 1d4c658
commit 0bacbf7
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/js/functions.js b/js/functions.js
@@ -1501,8 +1501,10 @@ function PMA_highlightSQL(base)
         if ($pre.is(":visible")) {
             var $highlight = $('<div class="sql-highlight cm-s-default"></div>');
             $sql.append($highlight);
-            CodeMirror.runMode($sql.text(), 'text/x-mysql', $highlight[0]);
-            $pre.hide();
+            if (typeof CodeMirror != 'undefined') {
+                CodeMirror.runMode($sql.text(), 'text/x-mysql', $highlight[0]);
+                $pre.hide();
+            }
         }
     });
 }