[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_4-7-gf463b1c

[Marc Delisle]

The branch, QA_3_3 has been updated
       via  f463b1cc7a87e8a7e69ee67d942cae34f4ac37ff (commit)
      from  f70bd16ce3e34877c6c07087b649ad3b5241e0c0 (commit)


- Log -----------------------------------------------------------------
commit f463b1cc7a87e8a7e69ee67d942cae34f4ac37ff
Author: Marc Delisle <marc at infomarc.info>
Date:   Tue Jun 29 07:48:28 2010 -0400

    bug #3022705 [import] Import button does not work in Catalan when there is no progress bar possible

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                        |    2 ++
 libraries/display_import.lib.php |    2 +-
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1840c48..7cdba96 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 4d40692..b5eab10 100644
--- a/libraries/display_import.lib.php
+++ b/libraries/display_import.lib.php
@@ -98,7 +98,7 @@ window.addEvent('domready', function() {
 	<?php
 	} else {
 	?>
-	  $('upload_form_status_info').set('html', '<img src="<?php echo $GLOBALS['pmaThemeImage'];?>ajax_clock_small.gif" alt="ajax clock" /> <?php echo $strImportUploadInfoNotAvailable . PMA_showDocu('faq2_9'); ?>');
+	  $('upload_form_status_info').set('html', '<img src="<?php echo $GLOBALS['pmaThemeImage'];?>ajax_clock_small.gif" alt="ajax clock" /> <?php echo PMA_jsFormat($strImportUploadInfoNotAvailable) . PMA_showDocu('faq2_9'); ?>');
 	  $('upload_form_status').setStyle("display", "none");
 	<?php
 	} // else 


hooks/post-receive
-- 
phpMyAdmin