Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin

Conflicts:
	ChangeLog

ChangeLog

@@ -24,6 +24,7 @@ phpMyAdmin - ChangeLog
 - issue #12218 Allow to specify further parameters for control connection
 - issue #12162 Show charset for each table on Database structure page
 - issue #12463 Incorrect link in the href of icon at Hide/Show unhide links
+- issue #12330 Shortcut for closing console
 
 4.6.5 (not yet released)
 - issue        Remove potentionally license problematic sRGB profile

js/shortcuts_handler.js

@@ -43,6 +43,11 @@ $(document).ready(function() {
             PMA_console.toggle();
         }
 
+        if( e.ctrlKey && e.keyCode == keyK ) {
+            e.preventDefault();
+            PMA_console.toggle();
+        }
+
         if( e.target.nodeName === 'INPUT' || e.target.nodeName === 'TEXTAREA' || e.target.nodeName === 'SELECT' ) {
             return;
         }
@@ -53,6 +58,7 @@ $(document).ready(function() {
             databaseOp = true;
         }
         else if(e.keyCode === keyK) {
+            e.preventDefault();
             PMA_console.toggle();
         }
         else if(e.keyCode === keyS) {