diff --git a/src/Orchard.Web/Modules/Orchard.Localization/Services/LocalizationService.cs b/src/Orchard.Web/Modules/Orchard.Localization/Services/LocalizationService.cs index 763de7ea3..5c1fda1d7 100644 --- a/src/Orchard.Web/Modules/Orchard.Localization/Services/LocalizationService.cs +++ b/src/Orchard.Web/Modules/Orchard.Localization/Services/LocalizationService.cs @@ -29,11 +29,13 @@ namespace Orchard.Localization.Services { if (localized == null) return null; + int masterContentItemId = localized.HasTranslationGroup ? localized.Record.MasterContentItemId : localized.Id; + // Warning: Returns only the first of same culture localizations. return _contentManager .Query(versionOptions, content.ContentItem.ContentType) .Where(l => - (l.Id == content.ContentItem.Id || l.MasterContentItemId == content.ContentItem.Id) + (l.Id == masterContentItemId || l.MasterContentItemId == masterContentItemId) && l.CultureId == cultureRecord.Id) .Slice(1) .FirstOrDefault();