From 4304883ec6059d255b338446ec2c6045296f5fc4 Mon Sep 17 00:00:00 2001
From: vargenau <vargenau@96ab9672-09ca-45d6-a79d-3d69d39ca109>
Date: Tue, 24 Sep 2013 16:29:03 +0000
Subject: [PATCH] No %20 in file name

git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/trunk@8842 96ab9672-09ca-45d6-a79d-3d69d39ca109
---
 lib/plugin/UpLoad.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/plugin/UpLoad.php b/lib/plugin/UpLoad.php
index a72d6704c..0d645062b 100644
--- a/lib/plugin/UpLoad.php
+++ b/lib/plugin/UpLoad.php
@@ -208,7 +208,7 @@ ws[cfh]");
             $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 @@ ws[cfh]");
                 $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.")));
-- 
2.42.0