From 5227d998ec1d59d7f980ad793ddf807f7a58ac3e Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Sun, 9 May 2010 07:00:49 -0400
Subject: [PATCH] bug #2998889 Import button does not work in Catalan

---
 ChangeLog                        | 1 +
 libraries/display_import.lib.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index f816c2b8f..10bf32a03 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 b99a8e26b..4d406926e 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