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

Fixing multi tenant content culture lookup - thanks to Mr Spits for the patch.

Browse Source
This commit is contained in:
Nicholas Mayne
2015-06-27 15:36:13 +01:00
parent 18166bd274
commit 4967fa807b
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/Orchard.Web/Modules/Orchard.Localization/Selectors/ContentCultureSelector.cs
View File

@@ -5,6 +5,7 @@ using Orchard.Alias;
using Orchard.ContentManagement; using Orchard.ContentManagement;
using Orchard.Environment.Extensions; using Orchard.Environment.Extensions;
using Orchard.Localization.Services; using Orchard.Localization.Services;
using Orchard.Environment.Configuration;
namespace Orchard.Localization.Selectors { namespace Orchard.Localization.Selectors {
[OrchardFeature("Orchard.Localization.CultureSelector")] [OrchardFeature("Orchard.Localization.CultureSelector")]
@@ -12,14 +13,17 @@ namespace Orchard.Localization.Selectors {
private readonly IAliasService _aliasService; private readonly IAliasService _aliasService;
private readonly IContentManager _contentManager; private readonly IContentManager _contentManager;
private readonly Lazy<ILocalizationService> _localizationService; private readonly Lazy<ILocalizationService> _localizationService;
private readonly ShellSettings _shellSettings;
public ContentCultureSelector( public ContentCultureSelector(
IAliasService aliasService, IAliasService aliasService,
IContentManager contentManager, IContentManager contentManager,
Lazy<ILocalizationService> localizationService) { Lazy<ILocalizationService> localizationService,
ShellSettings shellSettings) {
_aliasService = aliasService; _aliasService = aliasService;
_contentManager = contentManager; _contentManager = contentManager;
_localizationService = localizationService; _localizationService = localizationService;
_shellSettings = shellSettings;
} }
public CultureSelectorResult GetCulture(HttpContextBase context) { public CultureSelectorResult GetCulture(HttpContextBase context) {
@@ -40,6 +44,11 @@ namespace Orchard.Localization.Selectors {
var appPath = context.Request.ApplicationPath ?? "/"; var appPath = context.Request.ApplicationPath ?? "/";
var requestUrl = (path.StartsWith(appPath) ? path.Substring(appPath.Length) : path).TrimStart('/'); var requestUrl = (path.StartsWith(appPath) ? path.Substring(appPath.Length) : path).TrimStart('/');
var prefix = _shellSettings.RequestUrlPrefix;
if (!string.IsNullOrEmpty(prefix)) {
requestUrl = (requestUrl.StartsWith(prefix) ? requestUrl.Substring(prefix.Length) : requestUrl).TrimStart('/');
}
var content = GetByPath(requestUrl); var content = GetByPath(requestUrl);
if (content != null) { if (content != null) {
return new CultureSelectorResult { Priority = -2, CultureName = _localizationService.Value.GetContentCulture(content) }; return new CultureSelectorResult { Priority = -2, CultureName = _localizationService.Value.GetContentCulture(content) };