[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_4-5234-g90ac3d3

[Marc Delisle]

The branch, master has been updated
       via  90ac3d39a03235593b0952864bfd1e14139cc37c (commit)
      from  16ed06531a00ebac5bd33b40fbdb8139639f726c (commit)


- Log -----------------------------------------------------------------
commit 90ac3d39a03235593b0952864bfd1e14139cc37c
Author: Marc Delisle <marc at infomarc.info>
Date:   Tue Jun 29 07:56:10 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 7492e73..7772727 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 923d962..318dd34 100644
--- a/libraries/display_import.lib.php
+++ b/libraries/display_import.lib.php
@@ -96,7 +96,7 @@ if ($_SESSION[$SESSION_KEY]["handler"]!="noplugin") {
     <?php
 } else { // no plugin avaliable
     ?>
-                        $('#upload_form_status_info').html('<img src="<?php echo $GLOBALS['pmaThemeImage'];?>ajax_clock_small.gif" alt="ajax clock" /> <?php echo __('Please be patient, the file is being uploaded. Details about the upload are not available.') . PMA_showDocu('faq2_9'); ?>');
+                        $('#upload_form_status_info').html('<img src="<?php echo $GLOBALS['pmaThemeImage'];?>ajax_clock_small.gif" alt="ajax clock" /> <?php echo PMA_jsFormat(__('Please be patient, the file is being uploaded. Details about the upload are not available.')) . PMA_showDocu('faq2_9'); ?>');
                         $('#upload_form_status').css("display", "none");
     <?php
 } // else


hooks/post-receive
-- 
phpMyAdmin