Merge branch 'refs/heads/1.10.x' into dev

jersiovic · Apr 13, 2017 · f146acf · f146acf
2 parents 324261b + d384110
commit f146acf
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/src/Orchard.Web/Modules/Orchard.MediaLibrary/Controllers/ClientStorageController.cs b/src/Orchard.Web/Modules/Orchard.MediaLibrary/Controllers/ClientStorageController.cs
@@ -11,6 +11,7 @@
 using Orchard.Localization;
 using System.Linq;
 using Orchard.FileSystems.Media;
+using Orchard.Logging;
 
 namespace Orchard.MediaLibrary.Controllers {
     [Admin, Themed(false)]
@@ -26,10 +27,12 @@ public ClientStorageController(
             _mimeTypeProvider = mimeTypeProvider;
             Services = orchardServices;
             T = NullLocalizer.Instance;
+            Logger = NullLogger.Instance;
         }
 
         public IOrchardServices Services { get; set; }
         public Localizer T { get; set; }
+        public ILogger Logger { get; set; }
 
         public ActionResult Index(string folderPath, string type, int? replaceId = null) {
             if (!Services.Authorizer.Authorize(Permissions.ManageOwnMedia)) {
@@ -110,6 +113,7 @@ public ActionResult Upload(string folderPath, string type) {
                     });
                 }
                 catch (Exception ex) {
+                    Logger.Error(ex, "Unexpected exception when uploading a media.");
                     statuses.Add(new {
                         error = T(ex.Message).Text,
                         progress = 1.0,
@@ -189,6 +193,8 @@ public ActionResult Replace(int replaceId, string type) {
                     });
                 }
                 catch (Exception ex) {
+                    Logger.Error(ex, "Unexpected exception when uploading a media.");
+
                     statuses.Add(new {
                         error = T(ex.Message).Text,
                         progress = 1.0,