[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_1RC1-244-g7e77192

[Marc Delisle]

The branch, master has been updated
       via  7e77192187443d78a7de5ccdec174520608a661a (commit)
      from  3c7538701d361dea1c8ac4c0450bf477e74f3e1f (commit)


- Log -----------------------------------------------------------------
commit 7e77192187443d78a7de5ccdec174520608a661a
Author: Marc Delisle <marc at infomarc.info>
Date:   Thu Mar 18 13:02:13 2010 -0400

    rfe 2958013 After import, also list uploaded filename

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

Summary of changes:
 ChangeLog  |    2 ++
 import.php |    2 ++
 2 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ab7277c..f9ec21d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -49,6 +49,8 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
 + [lang] Turkish update, thanks to Burak Yavuz
 + rfe #2963310 [interface] Focus TEXTAREA "sql_query" on click on "SQL" link
 + [lang] Uzbek update, thanks to Orzu Samarqandiy
++ rfe #2958013 [import] After import, also list uploaded filename, thanks
+  to Pavel Konnikov and Herman van Rink
 
 3.3.2.0 (not yet released)
 - patch #2969449 [core] Name for MERGE engine varies depending on the
diff --git a/import.php b/import.php
index 7aa6088..7f06ceb 100644
--- a/import.php
+++ b/import.php
@@ -411,9 +411,11 @@ if (!empty($id_bookmark) && $action_bookmark == 2) {
             $message->addParam($executed_queries);
 
             $message->addString($import_notice);
+            $message->addString('(' . $_FILES['import_file']['name'] . ')');
         } else {
             $message = PMA_Message::success('strImportSuccessfullyFinished');
             $message->addParam($executed_queries);
+            $message->addString('(' . $_FILES['import_file']['name'] . ')');
         }
     }
 }


hooks/post-receive
-- 
phpMyAdmin