The branch, master has been updated via c968408de7b5353832c428cc85901080ed7394f8 (commit) via 9a268729f0cb0aeb2d124b58ca22ef8e7bd7baf6 (commit) via 201ad07ea8883fc8c3a18227a656ea56fe7b18fc (commit) from 3024f1e8672b63d8f88db70db4943acebfa16420 (commit)

- Log ----------------------------------------------------------------- commit c968408de7b5353832c428cc85901080ed7394f8 Merge: 3024f1e8672b63d8f88db70db4943acebfa16420 9a268729f0cb0aeb2d124b58ca22ef8e7bd7baf6 Author: Marc Delisle marc@infomarc.info Date: Fri Jul 22 09:35:51 2011 -0400

Merge branch 'QA_3_4'

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

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 dc2f709..24167bd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -54,6 +54,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 052a023..d709631 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