lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-09-19 10:07:55 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Media Library: Fixing NRE when renaming folder while having ManageMediaContent permission

Browse Source
This commit is contained in:
Lombiq
2016-02-24 00:11:24 +01:00
committed by Benedek Farkas
parent 6cd28be1a0
commit b983787d0d
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Orchard.Web/Modules/Orchard.MediaLibrary/Controllers/FolderController.cs
View File

@@ -165,7 +165,7 @@ namespace Orchard.MediaLibrary.Controllers {
foreach (var media in Services.ContentManager.Query().ForPart<MediaPart>().ForContentItems(mediaItemIds).List()) { foreach (var media in Services.ContentManager.Query().ForPart<MediaPart>().ForContentItems(mediaItemIds).List()) {
// don't try to rename the file if there is no associated media file // don't try to rename the file if there is no associated media file
if (!String.IsNullOrEmpty(media.FileName)) { if (!string.IsNullOrEmpty(media.FileName)) {
var uniqueFilename = _mediaLibraryService.GetUniqueFilename(folderPath, media.FileName); var uniqueFilename = _mediaLibraryService.GetUniqueFilename(folderPath, media.FileName);
_mediaLibraryService.MoveFile(media.FolderPath, media.FileName, folderPath, uniqueFilename); _mediaLibraryService.MoveFile(media.FolderPath, media.FileName, folderPath, uniqueFilename);
media.FileName = uniqueFilename; media.FileName = uniqueFilename;
@@ -179,7 +179,10 @@ namespace Orchard.MediaLibrary.Controllers {
private bool IsRootFolder(string folderPath) { private bool IsRootFolder(string folderPath) {
var rootMediaFolder = _mediaLibraryService.GetRootMediaFolder(); var rootMediaFolder = _mediaLibraryService.GetRootMediaFolder();
return String.Equals(rootMediaFolder.MediaPath, folderPath, StringComparison.OrdinalIgnoreCase);
return rootMediaFolder == null ?
string.IsNullOrEmpty(folderPath) :
string.Equals(rootMediaFolder.MediaPath, folderPath, StringComparison.OrdinalIgnoreCase);
} }
} }
} }