The branch, master has been updated via c48b786632ae0b786cc8fde8b2419d927a3baf1e (commit) from 195a084f38bd051ab8de3d19f7fa07d62d810263 (commit)

- Log ----------------------------------------------------------------- commit c48b786632ae0b786cc8fde8b2419d927a3baf1e Author: Herman van Rink rink@initfour.nl Date: Tue Mar 2 11:01:56 2010 +0100

uploadprogress: cleanup + added documentation link

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

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

diff --git a/libraries/display_import.lib.php b/libraries/display_import.lib.php index c24ff99..b99a8e2 100644 --- a/libraries/display_import.lib.php +++ b/libraries/display_import.lib.php @@ -26,7 +26,7 @@ if (empty($import_list)) { } ?>

-<iframe id="import_upload_iframe" name="import_upload_iframe" width="1" height="1" style="display: none" src="import.php?<?php echo PMA_generate_common_url(); ?>"></iframe> +<iframe id="import_upload_iframe" name="import_upload_iframe" width="1" height="1" style="display: none"></iframe> <div id="import_form_status" style="display: none;"></div> <div id="importmain"> <img src="<?php echo $GLOBALS['pmaThemeImage'];?>ajax_clock_small.gif" alt="ajax clock" style="display: none;" /> @@ -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; ?>'); + $('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').setStyle("display", "none"); <?php } // else diff --git a/libraries/display_import_ajax.lib.php b/libraries/display_import_ajax.lib.php index cf75da3..c05cd4d 100644 --- a/libraries/display_import_ajax.lib.php +++ b/libraries/display_import_ajax.lib.php @@ -31,7 +31,7 @@ $plugins = array( "uploadprogress", "apc", "noplugin" - ); // available plugins. Each plugin has own checkfunction in upload_functions.php and own file with functions in upload_#KEY#.php + ); // available plugins. Each plugin has own checkfunction in display_import_ajax.lib.php and own file with functions in upload_#KEY#.php

// select available plugin foreach ($plugins as $plugin) { @@ -40,8 +40,8 @@ foreach ($plugins as $plugin) { if ($check()) { $_SESSION[$SESSION_KEY]["handler"] = $plugin; include_once("import/upload/" . $plugin . ".php"); - break; - } + break; + } }

/**

hooks/post-receive