[phpwiki-checkins] SF.net SVN: phpwiki:[8842] trunk/lib/plugin/UpLoad.php

[<var...@us...>]

Revision: 8842
          http://sourceforge.net/p/phpwiki/code/8842
Author:   vargenau
Date:     2013-09-24 16:29:03 +0000 (Tue, 24 Sep 2013)
Log Message:
-----------
No %20 in file name

Modified Paths:
--------------
    trunk/lib/plugin/UpLoad.php

Modified: trunk/lib/plugin/UpLoad.php
===================================================================
--- trunk/lib/plugin/UpLoad.php	2013-09-24 16:27:03 UTC (rev 8841)
+++ trunk/lib/plugin/UpLoad.php	2013-09-24 16:29:03 UTC (rev 8842)
@@ -208,7 +208,7 @@
             $u_userfile = preg_replace("/ /", "%20", $u_userfile);
             $userfile_tmpname = $userfile->getTmpName();
             $err_header = HTML::div(array('class' => 'error'),
-                HTML::p(fmt("ERROR uploading “%s”", $userfile_name)));
+                HTML::p(fmt("Error uploading “%s”", $userfile_name)));
             if (preg_match("/(\." . join("|\.", $this->disallowed_extensions) . ")(\.|\$)/i",
                 $userfile_name)
             ) {
@@ -226,7 +226,7 @@
                 $err_header->pushContent(HTML::p(_("Invalid filename. File names may only contain alphanumeric characters and dot, underscore, space or dash.")));
                 $message->pushContent($err_header);
             } elseif (file_exists($file_dir . $userfile_name)) {
-                $err_header->pushContent(HTML::p(fmt("There is already a file with name %s uploaded.", $u_userfile)));
+                $err_header->pushContent(HTML::p(fmt("There is already a file with name “%s” uploaded.", $userfile_name)));
                 $message->pushContent($err_header);
             } elseif ($userfile->getSize() > (MAX_UPLOAD_SIZE)) {
                 $err_header->pushContent(HTML::p(_("Sorry but this file is too big.")));

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.