diff --git a/src/Orchard.Web/Modules/Orchard.ContentPicker/Tokens/FieldTokens.cs b/src/Orchard.Web/Modules/Orchard.ContentPicker/Tokens/FieldTokens.cs index f10bcfb52..341b15eaa 100644 --- a/src/Orchard.Web/Modules/Orchard.ContentPicker/Tokens/FieldTokens.cs +++ b/src/Orchard.Web/Modules/Orchard.ContentPicker/Tokens/FieldTokens.cs @@ -3,6 +3,7 @@ using Orchard.ContentManagement; using Orchard.Events; using Orchard.ContentPicker.Fields; using Orchard.Localization; +using NHibernate.Util; namespace Orchard.ContentPicker.Tokens { public interface ITokenProvider : IEventHandler { @@ -28,7 +29,10 @@ namespace Orchard.ContentPicker.Tokens { public void Evaluate(dynamic context) { context.For("ContentPickerField") .Token("Content", (Func)(field => field.Ids[0])) - .Chain("Content", "Content", (Func)(field => _contentManager.Get(field.Ids[0]))) + .Chain("Content", "Content", (Func)(field => { + var id = field.Ids.Any() ? field.Ids[0] : 0; + return _contentManager.Get(id); + })) ; } }