[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_3RC1-5-g5227d99

[Marc Delisle]

The branch, QA_3_3 has been updated
       via  5227d998ec1d59d7f980ad793ddf807f7a58ac3e (commit)
      from  972101f08ca5b1d6bbbc5dac579247472567f28e (commit)


- Log -----------------------------------------------------------------
commit 5227d998ec1d59d7f980ad793ddf807f7a58ac3e
Author: Marc Delisle <marc at infomarc.info>
Date:   Sun May 9 07:00:49 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 f816c2b..10bf32a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
 
 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 b99a8e2..4d40692 100644
--- a/libraries/display_import.lib.php
+++ b/libraries/display_import.lib.php
@@ -66,7 +66,7 @@ window.addEvent('domready', function() {
 	      $clear(periodical_upload);
 	      $('importmain').setStyle('display', 'none');
 	      $('import_form_status').setStyle('display', 'inline');
-	      $('import_form_status').set('html', '<img src="<?php echo $GLOBALS['pmaThemeImage'];?>ajax_clock_small.gif" alt="ajax clock" /> <?php echo $strImportProceedingFile; ?> ');
+	      $('import_form_status').set('html', '<img src="<?php echo $GLOBALS['pmaThemeImage'];?>ajax_clock_small.gif" alt="ajax clock" /> <?php echo PMA_jsFormat($strImportProceedingFile); ?> ');
 	      $('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
-- 
phpMyAdmin