From f463b1cc7a87e8a7e69ee67d942cae34f4ac37ff Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Tue, 29 Jun 2010 07:48:28 -0400 Subject: [PATCH 01/82] bug #3022705 [import] Import button does not work in Catalan when there is no progress bar possible --- ChangeLog | 2 ++ libraries/display_import.lib.php | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 1840c483b..7cdba9629 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,8 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA 3.3.5.0 (not yet released) - patch #2932113 [information_schema] Slow export when having lots of databases, thanks to Stéphane Pontier - shadow_walker +- bug #3022705 [import] Import button does not work in Catalan when there + is no progress bar possible 3.3.4.0 (2010-06-28) - bug #2996161 [import] properly escape import value diff --git a/libraries/display_import.lib.php b/libraries/display_import.lib.php index 4d406926e..b5eab108f 100644 --- a/libraries/display_import.lib.php +++ b/libraries/display_import.lib.php @@ -98,7 +98,7 @@ window.addEvent('domready', function() { - $('upload_form_status_info').set('html', 'ajax clock '); + $('upload_form_status_info').set('html', 'ajax clock '); $('upload_form_status').setStyle("display", "none"); Date: Tue, 29 Jun 2010 07:56:10 -0400 Subject: [PATCH 02/82] bug #3022705 [import] Import button does not work in Catalan when there is no progress bar possible --- ChangeLog | 2 ++ libraries/display_import.lib.php | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 7492e7377..7772727a8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -88,6 +88,8 @@ $Id$ 3.3.5.0 (not yet released) - patch #2932113 [information_schema] Slow export when having lots of databases, thanks to Stéphane Pontier - shadow_walker +- bug #3022705 [import] Import button does not work in Catalan when there + is no progress bar possible 3.3.4.0 (2010-06-28) - bug #2996161 [import] properly escape import value diff --git a/libraries/display_import.lib.php b/libraries/display_import.lib.php index 923d9622d..318dd34df 100644 --- a/libraries/display_import.lib.php +++ b/libraries/display_import.lib.php @@ -96,7 +96,7 @@ if ($_SESSION[$SESSION_KEY]["handler"]!="noplugin") { - $('#upload_form_status_info').html('ajax clock '); + $('#upload_form_status_info').html('ajax clock '); $('#upload_form_status').css("display", "none"); Date: Tue, 29 Jun 2010 07:57:45 -0400 Subject: [PATCH 03/82] fix typo; remove Id --- libraries/display_import.lib.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libraries/display_import.lib.php b/libraries/display_import.lib.php index 318dd34df..dd9f650cc 100644 --- a/libraries/display_import.lib.php +++ b/libraries/display_import.lib.php @@ -2,7 +2,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ /** * - * @version $Id$ * @package phpMyAdmin */ if (! defined('PHPMYADMIN')) { @@ -94,7 +93,7 @@ if ($_SESSION[$SESSION_KEY]["handler"]!="noplugin") { window.setTimeout(perform_upload, 1000); $('#upload_form_status_info').html('ajax clock '); $('#upload_form_status').css("display", "none"); From 852ed51c27f35ec942440e0330318775d8e4c91d Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Tue, 29 Jun 2010 08:14:31 -0400 Subject: [PATCH 04/82] bug [replication] Do not offer information_schema in the list of databases --- ChangeLog | 1 + libraries/replication_gui.lib.php | 3 +++ 2 files changed, 4 insertions(+) diff --git a/ChangeLog b/ChangeLog index 7cdba9629..66873fb3f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA databases, thanks to Stéphane Pontier - shadow_walker - bug #3022705 [import] Import button does not work in Catalan when there is no progress bar possible +- bug [replication] Do not offer information_schema in the list of databases 3.3.4.0 (2010-06-28) - bug #2996161 [import] properly escape import value diff --git a/libraries/replication_gui.lib.php b/libraries/replication_gui.lib.php index d77280068..b5f14ad80 100644 --- a/libraries/replication_gui.lib.php +++ b/libraries/replication_gui.lib.php @@ -72,6 +72,9 @@ function PMA_replication_db_multibox() $multi_values .= '