Fix Attach: links with escaped path and filenames.

git-svn-id: svn://pmwiki.org/pmwiki/trunk@4581 524c5546-5005-0410-9a3e-e25e191bd360

1 files changed, 2 insertions, 1 deletions

diff --git a/scripts/upload.php b/scripts/upload.php
index 7bf21abb..370a904a 100644
--- a/scripts/upload.php
+++ b/scripts/upload.php
@@ -156,13 +156,14 @@ function MakeUploadName($pagename,$x) {
     '/(\\.[^.]*)$/' => 'cb_tolower',
     '/^[^[:alnum:]_]+/' => '',
     '/[^[:alnum:]_]+$/' => ''));
-   return PPRA($MakeUploadNamePatterns, $x);
+   return PPRA($MakeUploadNamePatterns, MarkupRestore($x));
 }
 
 ##  This helper function returns the public URL for an attached file
 function DownloadUrl($pagename, $path) {
   global $FmtV, $UploadFileFmt,
     $UploadUrlFmt, $UploadPrefixFmt, $EnableDirectDownload;
+  $path = MarkupRestore($path);
   if (preg_match('!^(.*)/([^/]+)$!', $path, $match)) {
     $pagename = MakePageName($pagename, $match[1]);
     $path = $match[2];