[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_4-5235-gf368184 - Git

29 Jun 2010

The branch, master has been updated
       via  f368184a12c2fc619ef442e588e07be58c3c6085 (commit)
      from  90ac3d39a03235593b0952864bfd1e14139cc37c (commit)
- Log -----------------------------------------------------------------
commit f368184a12c2fc619ef442e588e07be58c3c6085
Author: Marc Delisle marc@infomarc.info
Date:   Tue Jun 29 07:57:45 2010 -0400
fix typo; remove Id
-----------------------------------------------------------------------
Summary of changes:
 libraries/display_import.lib.php |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/libraries/display_import.lib.php b/libraries/display_import.lib.php
index 318dd34..dd9f650 100644
--- a/libraries/display_import.lib.php
+++ b/libraries/display_import.lib.php
@@ -2,7 +2,6 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  *
- * @version $Id$
  * @package phpMyAdmin
  */
 if (! defined('PHPMYADMIN')) {
@@ -94,7 +93,7 @@ if ($_SESSION[$SESSION_KEY]["handler"]!="noplugin") {
                 window.setTimeout(perform_upload, 1000);
<?php
-} else { // no plugin avaliable
+} 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').css("display", "none");
hooks/post-receive
-- 
phpMyAdmin


    