From 481e89ac941cd5567ad39ee4fcec6ea3eb25e4ae Mon Sep 17 00:00:00 2001
From: Madhura Jayaratne <madhura.cj@gmail.com>
Date: Mon, 22 Dec 2014 16:18:27 +0530
Subject: [PATCH] Fix merge conflict

Signed-off-by: Marc Delisle <marc@infomarc.info>
---
 ChangeLog     | 1 +
 js/console.js | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 78266a3b28..d406107f06 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@ phpMyAdmin - ChangeLog
 4.3.4.0 (not yet released)
 - bug #4653 Always connection error was shown, on /setup at tab "configuration storage"
 - bug #4661 Drag and drop file import always fails
+- bug #4651 don't open console with esc
 
 4.3.3.0 (2014-12-21)
 - bug       The "Recently used tables" setting should be with Nav panel
diff --git a/js/console.js b/js/console.js
index d832297001..5f21b645d5 100644
--- a/js/console.js
+++ b/js/console.js
@@ -119,8 +119,8 @@ var PMA_console = {
 
             PMA_console.$consoleToolbar.children('.console_switch').click(PMA_console.toggle);
             $(document).keydown(function(event) {
-                // 27 keycode is ESC
-                if(event.keyCode === 27) {
+                // Ctrl + Alt + C
+                if(event.ctrlKey && event.altKey && event.keyCode === 67) {
                     PMA_console.toggle();
                 }
             });