From c44ca04676c20b30b20e960f3fd7c41d790cab8b Mon Sep 17 00:00:00 2001 From: Dave Reed Date: Thu, 10 Mar 2011 11:17:04 -0800 Subject: [PATCH] Deleting media files was broke. And when it failed, it double failed with a NullReferenceException while redirecting you. --HG-- branch : dev --- .../Modules/Orchard.Media/Controllers/AdminController.cs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/Orchard.Web/Modules/Orchard.Media/Controllers/AdminController.cs b/src/Orchard.Web/Modules/Orchard.Media/Controllers/AdminController.cs index 0900b34bc..041cfb9ce 100644 --- a/src/Orchard.Web/Modules/Orchard.Media/Controllers/AdminController.cs +++ b/src/Orchard.Web/Modules/Orchard.Media/Controllers/AdminController.cs @@ -102,7 +102,7 @@ namespace Orchard.Media.Controllers { string folderName = input[fileName]; if (!Services.Authorizer.Authorize(Permissions.ManageMedia, T("Couldn't delete media file"))) return new HttpUnauthorizedResult(); - _mediaService.DeleteFile(fileName, folderName); + _mediaService.DeleteFile(folderName, fileName); Services.Notifier.Information(T("Media file deleted")); } @@ -119,8 +119,7 @@ namespace Orchard.Media.Controllers { return RedirectToAction("Index"); } catch (Exception exception) { this.Error(exception, T("Deleting failed: {0}", exception.Message), Logger, Services.Notifier); - - return View(); + return RedirectToAction("Index"); } }