[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-13013-gc8a147c

[Michal Čihař]

The branch, master has been updated
       via  c8a147c4eed04c4d344aa9e45acce7411d2a5603 (commit)
       via  9a938ed9867317474ae4bb63a17270c34040d2b5 (commit)
      from  872ddd034ff325e88caef9b8863bc5fa49734456 (commit)


- Log -----------------------------------------------------------------
commit c8a147c4eed04c4d344aa9e45acce7411d2a5603
Author: Michal Čihař <michal at cihar.com>
Date:   Thu Aug 4 19:44:36 2011 +0200

    Fix typo

commit 9a938ed9867317474ae4bb63a17270c34040d2b5
Author: Michal Čihař <michal at cihar.com>
Date:   Thu Aug 4 19:44:22 2011 +0200

    Fix comments

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

Summary of changes:
 file_echo.php |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/file_echo.php b/file_echo.php
index 58ff86b..5e92cb7 100644
--- a/file_echo.php
+++ b/file_echo.php
@@ -28,10 +28,10 @@ if (isset($_REQUEST['filename']) && isset($_REQUEST['image'])) {
     $valid_match = '/^[^\n\r]*\.' . $extension . '$/';
     if (! preg_match($valid_match, $_REQUEST['filename'])) {
         if (! preg_match('/^[^\n\r]*$/', $_REQUEST['filename'])) {
-            /* Add extension */
-            $filename = 'dowload.' . $extension;
-        } else {
             /* Filename is unsafe, discard it */
+            $filename = 'download.' . $extension;
+        } else {
+            /* Add extension */
             $filename = $_REQUEST['filename'] . '.' . $extension;
         }
     } else {


hooks/post-receive
-- 
phpMyAdmin