lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 19:54:57 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

#20218: Disambiguating media with same filename during upgrade

Browse Source 
Work Item: 20218
This commit is contained in:
Sebastien Ros
2013-10-24 14:36:44 -07:00
parent 5d06964983
commit c7d2593382
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Orchard.Web/Modules/Upgrade/Controllers/MediaController.cs
View File

@@ -184,7 +184,15 @@ namespace Upgrade.Controllers {
if (contentField != null && contentField.Url != null) {
string url = Convert.ToString(contentField.Url);
var filename = Path.GetFileName(url);
var media = _orchardServices.ContentManager.Query().ForPart<MediaPart>().Where<MediaPartRecord>(x => filename == x.FileName).Slice(0, 1).FirstOrDefault();
string folder = Path.GetDirectoryName(url);
var mediaItems = _orchardServices.ContentManager.Query().ForPart<MediaPart>().Where<MediaPartRecord>(x => filename == x.FileName).List().ToList();
MediaPart media = null;
// in case multiple media have the same filename find based on the folder
if (mediaItems.Count() > 1) {
media = mediaItems.FirstOrDefault(x => folder.EndsWith(x.FolderPath));
}
if (media != null) {
contentField.Url = "{" + media.Id + "}";
}