Merge remote-tracking branch 'origin/master'

phpmyadmin · Jul 1, 2012 · 4b0d431 · 4b0d431
2 parents 7b57ed6 + 9e37ad6
commit 4b0d431
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -61,6 +61,8 @@ VerboseMultiSubmit, ReplaceHelpImg
 - bug #3534121 [config] duplicate line in config.sample.inc.php
 - bug #3534311 [interface] Grid editing incorrectly parses ENUM/SET values
 - bug #3510196 [core] More clever URL rewriting with ForceSSL
+- bug #3539044 [interface] Browse mode "Show" button gives blank page if no results anymore
+- bug #3534979 [interface] Copy Database Ajax feedback vanishes long before copying is done
 
 3.5.1.0 (2012-05-03)
 - bug #3510784 [edit] Limit clause ignored when sort order is remembered

diff --git a/js/db_operations.js b/js/db_operations.js
@@ -45,7 +45,7 @@ $(function() {
         button_options[PMA_messages['strNo']] = function() { $(this).dialog("close").remove(); }
 
         $form.PMA_confirm(question, $form.attr('action'), function(url) {
-            PMA_ajaxShowMessage(PMA_messages['strRenamingDatabases']);
+            PMA_ajaxShowMessage(PMA_messages['strRenamingDatabases'], false);
 
             $.get(url, $("#rename_db_form").serialize() + '&is_js_confirmed=1', function(data) {
                 if(data.success == true) {
@@ -84,7 +84,7 @@ $(function() {
     $("#copy_db_form.ajax").live('submit', function(event) {
         event.preventDefault();
 
-        var $msgbox = PMA_ajaxShowMessage(PMA_messages['strCopyingDatabase']);
+        PMA_ajaxShowMessage(PMA_messages['strCopyingDatabase'], false);
 
         var $form = $(this);
 
@@ -94,7 +94,7 @@ $(function() {
             // use messages that stay on screen
             $('div.success, div.error').fadeOut();
             if(data.success == true) {
-                $('#floating_menubar').after(data.message);
+                PMA_ajaxShowMessage(data.message);
                 if( $("#checkbox_switch").is(":checked")) {
                     window.parent.db = data.newname;
                     window.parent.refreshMain();
@@ -106,10 +106,8 @@ $(function() {
                     window.parent.refreshNavigation(true);
                }
             } else {
-                $('#floating_menubar').after(data.error);
+                PMA_ajaxShowMessage(data.error, false);
             }
-
-            PMA_ajaxRemoveMessage($msgbox);
         }) // end $.get
     }) // end copy database