From b4044bb7700ce482f044c6b7622ab6c79bb08a27 Mon Sep 17 00:00:00 2001
From: Nisarg Jhaveri <nisargjhaveri@gmail.com>
Date: Sun, 1 Nov 2015 03:51:45 +0530
Subject: [PATCH] fix #11627, CREATE TABLE/INSERT INTO executed twice
 (ctrl+enter)

Signed-off-by: Nisarg Jhaveri <nisargjhaveri@gmail.com>
---
 ChangeLog       |  1 +
 js/functions.js | 15 ++++-----------
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c0f53faebf..db2c98754d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,7 @@ phpMyAdmin - ChangeLog
 - issue #11612 Undefined index: new_row_format
 - issue #11605 Changing hostname kills password
 - issue #11614 Undefined variable: db
+- issue #11627 CREATE TABLE/INSERT INTO executed twice (ctrl+enter)
 
 4.5.1.0 (2015-10-23)
 - issue        Invalid argument supplied for foreach()
diff --git a/js/functions.js b/js/functions.js
index 1bf638dfce..bc3b2cb1e4 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -1977,23 +1977,19 @@ function bindCodeMirrorToInlineEditor() {
             codemirror_inline_editor.refresh();
             codemirror_inline_editor.focus();
             $(codemirror_inline_editor.getWrapperElement())
-                .bind('keydown', catchKeypressesFromSqlTextboxes);
+                .bind('keydown', catchKeypressesFromSqlInlineEdit);
         } else {
             $inline_editor
                 .focus()
-                .bind('keydown', catchKeypressesFromSqlTextboxes);
+                .bind('keydown', catchKeypressesFromSqlInlineEdit);
         }
     }
 }
 
-function catchKeypressesFromSqlTextboxes(event) {
+function catchKeypressesFromSqlInlineEdit(event) {
     // ctrl-enter is 10 in chrome and ie, but 13 in ff
     if (event.ctrlKey && (event.keyCode == 13 || event.keyCode == 10)) {
-        if ($('#sql_query_edit').length > 0) {
-            $("#sql_query_edit_save").trigger('click');
-        } else if ($('#sqlquery').length > 0) {
-            $("#button_submit_query").trigger('click');
-        }
+        $("#sql_query_edit_save").trigger('click');
     }
 }
 
@@ -4196,13 +4192,10 @@ AJAX.registerOnload('functions.js', function () {
         if (typeof CodeMirror != 'undefined') {
             codemirror_editor = PMA_getSQLEditor($elm);
             codemirror_editor.focus();
-            $(codemirror_editor.getWrapperElement())
-                .bind('keydown', catchKeypressesFromSqlTextboxes);
             codemirror_editor.on("blur", updateQueryParameters);
         } else {
             // without codemirror
             $elm.focus()
-                .bind('keydown', catchKeypressesFromSqlTextboxes)
                 .bind('blur', updateQueryParameters);
         }
     }