From 1fa29f9cfe2e48f02ec26c1d48cd9aab071b9b4a Mon Sep 17 00:00:00 2001
From: Sebastien Ros <none@none>
Date: Wed, 26 Jun 2013 12:42:40 -0700
Subject: [PATCH] Decoding media urls containing %xx in their names during
 upgrade

--HG--
branch : 1.x
---
 .../Modules/Upgrade/Controllers/MediaController.cs            | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Orchard.Web/Modules/Upgrade/Controllers/MediaController.cs b/src/Orchard.Web/Modules/Upgrade/Controllers/MediaController.cs
index cc1c43d3f..dc868c594 100644
--- a/src/Orchard.Web/Modules/Upgrade/Controllers/MediaController.cs
+++ b/src/Orchard.Web/Modules/Upgrade/Controllers/MediaController.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Web;
 using System.Web.Mvc;
 using Orchard;
 using Orchard.Environment.Features;
@@ -103,7 +104,8 @@ namespace Upgrade.Controllers {
                 _orchardServices.Notifier.Information(T("Importing {0}.", mediaFile.MediaPath));
                 var storageFile = _storageProvider.GetFile(mediaFile.MediaPath.Substring(trim));
                 using (var stream = storageFile.OpenRead()) {
-                    _mediaLibraryService.ImportStream(mediaLibraryFolder.TermId, stream, Path.GetFileName(mediaFile.MediaPath));
+                    var filename = HttpUtility.UrlDecode(mediaFile.MediaPath);
+                    _mediaLibraryService.ImportStream(mediaLibraryFolder.TermId, stream, Path.GetFileName(filename));
                 }
             }
             catch(Exception e) {