[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_3_1-40-g9a26872

[Marc Delisle]

The branch, QA_3_4 has been updated
       via  9a268729f0cb0aeb2d124b58ca22ef8e7bd7baf6 (commit)
       via  201ad07ea8883fc8c3a18227a656ea56fe7b18fc (commit)
      from  5f9c187010dcf2b51bf3dee516789b6fae9f2363 (commit)


- Log -----------------------------------------------------------------
commit 9a268729f0cb0aeb2d124b58ca22ef8e7bd7baf6
Author: Marc Delisle <marc at infomarc.info>
Date:   Fri Jul 22 09:34:42 2011 -0400

    ChangeLog entry for bug #3374347

commit 201ad07ea8883fc8c3a18227a656ea56fe7b18fc
Author: Sven Strickroth <email at cs-ware.de>
Date:   Fri Jul 22 00:52:06 2011 +0200

    Do not add backquotes for normal displayed text
    
    Signed-off-by: Sven Strickroth <email at cs-ware.de>

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

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

diff --git a/ChangeLog b/ChangeLog
index 250bd1a..76f3514 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,6 +15,7 @@ phpMyAdmin - ChangeLog
 - bug #3363221 [display] Missing Server Parameter on inline sql query
 - bug #3367986 [navi] Drop field -> lost active table
 - remove misleading comment on the "Rename database" interface
+- bug #3374347 [display] Backquotes in normal text on import page
 
 3.4.3.1 (2011-07-02)
 - [security] Fixed possible session manipulation in swekey authentication, see PMASA-2011-5
diff --git a/libraries/display_import.lib.php b/libraries/display_import.lib.php
index 3a9c2ea..c56c461 100644
--- a/libraries/display_import.lib.php
+++ b/libraries/display_import.lib.php
@@ -63,7 +63,7 @@ if ($_SESSION[$SESSION_KEY]["handler"]!="noplugin") {
                         complete = response.complete;
 
                           if (total==0 && complete==0 && percent==0) {
-                              $('#upload_form_status_info').html('<img src="<?php echo $GLOBALS['pmaThemeImage'];?>ajax_clock_small.gif" alt="ajax clock" /> <?php echo PMA_jsFormat(__('The file being uploaded is probably larger than the maximum allowed size or this is a known bug in webkit based (Safari, Google Chrome, Arora etc.) browsers.')); ?>');
+                              $('#upload_form_status_info').html('<img src="<?php echo $GLOBALS['pmaThemeImage'];?>ajax_clock_small.gif" alt="ajax clock" /> <?php echo PMA_jsFormat(__('The file being uploaded is probably larger than the maximum allowed size or this is a known bug in webkit based (Safari, Google Chrome, Arora etc.) browsers.'), false); ?>');
                               $('#upload_form_status').css("display", "none");
                           } else {
                               $('#upload_form_status_info').html(' '+Math.round(percent)+'%, '+complete+'/'+total);
@@ -73,7 +73,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 PMA_jsFormat(__('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.'), false); ?> ');
                                     $('#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
@@ -95,7 +95,7 @@ if ($_SESSION[$SESSION_KEY]["handler"]!="noplugin") {
     <?php
 } else { // no plugin available
     ?>
-                        $('#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_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.'), false) . PMA_showDocu('faq2_9'); ?>');
                         $('#upload_form_status').css("display", "none");
     <?php
 } // else


hooks/post-receive
-- 
phpMyAdmin