Merge remote-tracking branch 'origin/master'

phpmyadmin · Oct 17, 2012 · 060d7af · 060d7af
2 parents 6743193 + 6834eb7
commit 060d7af
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/js/functions.js b/js/functions.js
@@ -731,8 +731,10 @@ function setQuery(query)
 {
     if (codemirror_editor) {
         codemirror_editor.setValue(query);
+        codemirror_editor.focus();
     } else {
         document.sqlform.sql_query.value = query;
+        document.sqlform.sql_query.focus();
     }
 }