The branch, master has been updated via 78bb9c71c007b93a89799250cac053a8b012c5b4 (commit) from a3b034eacdb09bc6d5ef268bc68be2eeaf54e985 (commit)
- Log ----------------------------------------------------------------- commit 78bb9c71c007b93a89799250cac053a8b012c5b4 Author: Marc Delisle marc@infomarc.info Date: Sun May 9 07:07:15 2010 -0400
bug #2998889 Import button does not work in Catalan
-----------------------------------------------------------------------
Summary of changes: ChangeLog | 1 + libraries/display_import.lib.php | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/ChangeLog b/ChangeLog index df1988e..f3b0872 100644 --- a/ChangeLog +++ b/ChangeLog @@ -84,6 +84,7 @@ $Id$
3.3.4.0 (not yet released) - bug #2996161 [import] properly escape import value +- bug #2998889 [import] Import button does not work in Catalan
3.3.3.0 (not yet released) - patch #2982480 [navi] Do not group if there would be one table in group, diff --git a/libraries/display_import.lib.php b/libraries/display_import.lib.php index 343248a..0e803c4 100644 --- a/libraries/display_import.lib.php +++ b/libraries/display_import.lib.php @@ -74,7 +74,7 @@ if ($_SESSION[$SESSION_KEY]["handler"]!="noplugin") { if (finished==true) { $('#importmain').css('display', 'none'); $('#import_form_status').css('display', 'inline'); - $('#import_form_status').html('<img src="<?php echo $GLOBALS['pmaThemeImage'];?>ajax_clock_small.gif" alt="ajax clock" /> <?php echo __('The file is being processed, please be patient.'); ?> '); + $('#import_form_status').html('<img src="<?php echo $GLOBALS['pmaThemeImage'];?>ajax_clock_small.gif" alt="ajax clock" /> <?php echo PMA_jsFormat(__('The file is being processed, please be patient.')); ?> '); $('#import_form_status').load('import_status.php?message=true&<?php echo PMA_generate_common_url(); ?>'); // loads the message, either success or mysql error <?php // reload the left sidebar when the import is finished
hooks/post-receive