From 0d3a9e4ca6790480e99ca734a5cd3a8baae1a21e Mon Sep 17 00:00:00 2001 From: Hugues Peccatte Date: Sat, 27 Dec 2014 20:10:37 +0100 Subject: [PATCH 1/2] Fix #4673 Delimiter causing page lock Signed-off-by: Hugues Peccatte --- js/ajax.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/js/ajax.js b/js/ajax.js index a40ccd214e..da6584c26c 100644 --- a/js/ajax.js +++ b/js/ajax.js @@ -140,6 +140,11 @@ var AJAX = { * @return void */ lockPageHandler: function(event) { + //Don't lock on enter. + if (0 == event.charCode) { + return; + } + var lockId = $(this).data('lock-id'); if (typeof lockId === 'undefined') { return; From 70985f197ccd6904aae0f047284deb67813677b7 Mon Sep 17 00:00:00 2001 From: Hugues Peccatte Date: Sat, 27 Dec 2014 20:11:27 +0100 Subject: [PATCH 2/2] Update ChangeLog Signed-off-by: Hugues Peccatte --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 468a2dc348..3845039109 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17,6 +17,7 @@ phpMyAdmin - ChangeLog - bug #4667 Consistency in borders - bug #4658 Illegal string offset (Data_length, Index_length) - bug #4655 Undefined index: collation_connection +- bug #4673 Delimiter causing page lock 4.3.3.0 (2014-12-21) - bug The "Recently used tables" setting should be with Nav panel