Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0

2013-05-08 18:59:47 +02:00 · 2013-05-08 18:59:47 +02:00 · 0d8ac66a22
commit 0d8ac66a22
parent 7905eac5e9 39318927c2
2 changed files with 5 additions and 0 deletions
--- a/1
+++ b/1
@ -17,6 +17,7 @@ phpMyAdmin - ChangeLog
 - bug #3905 [export] Custom Exporting exports all databases
 - bug #3909 [import] Import of CSV FIle to selected table doesn't work
 - bug #3904 Browsing an empty table should not display its Structure
+- bug #3908 Calendar widget improperly redirects to home 

 4.0.0.0 (2013-05-03)
 + Patch #3481047 for rfe #3480477 Insert as new row enhancement
--- a/js/ajax.js
+++ b/js/ajax.js
@ -136,6 +136,10 @@ var AJAX = {
            return true;
        } else if (href && href.match(/^mailto/)) {
            return true;
+        } else if ($(this).hasClass('ui-datepicker-next') || 
+                   $(this).hasClass('ui-datepicker-prev')
+                  ) {
+            return true;
        }

        if (typeof event != 'undefined') {