Remove OriginalMediaPathScheme, changes how we extract the media file path and use that correctly instead of hacks.

This commit is contained in:
Shannon
2021-07-07 14:36:52 -06:00
parent 6402a0ca8d
commit 3eb54831cb
26 changed files with 274 additions and 289 deletions

View File

@@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using System.Linq;
using Umbraco.Cms.Core.Models;
@@ -25,8 +25,19 @@ namespace Umbraco.Extensions
if (urlSegmentProviders == null) throw new ArgumentNullException(nameof(urlSegmentProviders));
var url = urlSegmentProviders.Select(p => p.GetUrlSegment(content, culture)).FirstOrDefault(u => u != null);
url ??= new DefaultUrlSegmentProvider(shortStringHelper).GetUrlSegment(content, culture); // be safe
if (url == null)
{
if (s_defaultUrlSegmentProvider == null)
{
s_defaultUrlSegmentProvider = new DefaultUrlSegmentProvider(shortStringHelper);
}
url = s_defaultUrlSegmentProvider.GetUrlSegment(content, culture); // be safe
}
return url;
}
private static DefaultUrlSegmentProvider s_defaultUrlSegmentProvider;
}
}