From 6eb9e0d457c303c407a07e5c94c3566386715555 Mon Sep 17 00:00:00 2001
From: Skrypt <jasmin.savard@gmail.com>
Date: Thu, 21 May 2015 16:10:09 -0400
Subject: [PATCH] Fixing #5281

---
 src/Orchard.Web/Core/Navigation/Views/Admin/Index.cshtml  | 2 +-
 .../Views/EditorTemplates/Parts.MenuWidget.Edit.cshtml    | 2 +-
 .../EditorTemplates/Parts.Navigation.Menu.Edit.cshtml     | 2 +-
 .../Views/EditorTemplates/Parts.Navigation.Edit.cshtml    | 2 +-
 src/Orchard/Mvc/Html/ContentItemExtensions.cs             | 8 ++++++--
 5 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/Orchard.Web/Core/Navigation/Views/Admin/Index.cshtml b/src/Orchard.Web/Core/Navigation/Views/Admin/Index.cshtml
index bb81da637..8a2c7a776 100644
--- a/src/Orchard.Web/Core/Navigation/Views/Admin/Index.cshtml
+++ b/src/Orchard.Web/Core/Navigation/Views/Admin/Index.cshtml
@@ -22,7 +22,7 @@
                 <label for="menuId">@T("Current Menu:")</label>
                 <select id="menuId" name="menuId">
                     @foreach (var menu in Model.Menus) {
-                        @Html.SelectOption(Model.CurrentMenu.Id, menu.Id, Convert.ToString(Html.ItemDisplayText(menu)))
+                        @Html.SelectOption(Model.CurrentMenu.Id, menu.Id, Convert.ToString(Html.ItemDisplayText(menu, false)))
                     }
                 </select>
                 @if (hasPermission) { 
diff --git a/src/Orchard.Web/Core/Navigation/Views/EditorTemplates/Parts.MenuWidget.Edit.cshtml b/src/Orchard.Web/Core/Navigation/Views/EditorTemplates/Parts.MenuWidget.Edit.cshtml
index c505a208b..cb568e8ff 100644
--- a/src/Orchard.Web/Core/Navigation/Views/EditorTemplates/Parts.MenuWidget.Edit.cshtml
+++ b/src/Orchard.Web/Core/Navigation/Views/EditorTemplates/Parts.MenuWidget.Edit.cshtml
@@ -6,7 +6,7 @@
         @Html.LabelFor(m => m.CurrentMenuId, T("For Menu"))
         <select id="@Html.FieldIdFor(m => m.CurrentMenuId)" name="@Html.FieldNameFor(m => m.CurrentMenuId)">
 		@foreach(ContentItem menu in Model.Menus) {
-            @Html.SelectOption(Model.CurrentMenuId, menu.Id, Html.ItemDisplayText(menu).ToString())
+            @Html.SelectOption(Model.CurrentMenuId, menu.Id, Html.ItemDisplayText(menu, false).ToString())
 		}
 		</select>
         <span class="hint">@T("Select which menu you want to display")</span>
diff --git a/src/Orchard.Web/Core/Navigation/Views/EditorTemplates/Parts.Navigation.Menu.Edit.cshtml b/src/Orchard.Web/Core/Navigation/Views/EditorTemplates/Parts.Navigation.Menu.Edit.cshtml
index c81dd1ede..a51394ccc 100644
--- a/src/Orchard.Web/Core/Navigation/Views/EditorTemplates/Parts.Navigation.Menu.Edit.cshtml
+++ b/src/Orchard.Web/Core/Navigation/Views/EditorTemplates/Parts.Navigation.Menu.Edit.cshtml
@@ -11,7 +11,7 @@
         <div data-controllerid="@Html.FieldIdFor(m => m.OnMenu)" class="">
             <select id="@Html.FieldIdFor(m => m.CurrentMenuId)" name="@Html.FieldNameFor(m => m.CurrentMenuId)">
                 @foreach (ContentItem menu in Model.Menus) {
-                    @Html.SelectOption(Model.CurrentMenuId, menu.Id, Html.ItemDisplayText(menu).ToString())
+                    @Html.SelectOption(Model.CurrentMenuId, menu.Id, Html.ItemDisplayText(menu, false).ToString())
                 }
             </select>
             <span class="hint">@T("Select which menu you want the content item to be displayed on.")</span>
diff --git a/src/Orchard.Web/Modules/Orchard.ContentPicker/Views/EditorTemplates/Parts.Navigation.Edit.cshtml b/src/Orchard.Web/Modules/Orchard.ContentPicker/Views/EditorTemplates/Parts.Navigation.Edit.cshtml
index 8234426e4..972007790 100644
--- a/src/Orchard.Web/Modules/Orchard.ContentPicker/Views/EditorTemplates/Parts.Navigation.Edit.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.ContentPicker/Views/EditorTemplates/Parts.Navigation.Edit.cshtml
@@ -29,7 +29,7 @@
     <div data-controllerid="@Html.FieldIdFor(m => m.AddMenuItem)">
         <select id="@Html.FieldIdFor(m => m.CurrentMenuId)" name="@Html.FieldNameFor(m => m.CurrentMenuId)">
             @foreach (ContentItem menu in Model.Menus) {
-                @Html.SelectOption(Model.CurrentMenuId, menu.Id, Html.ItemDisplayText(menu).ToString())
+                @Html.SelectOption(Model.CurrentMenuId, menu.Id, Html.ItemDisplayText(menu, false).ToString())
             }
         </select>
         <span class="hint">@T("Select which menu you want the content item to be added on.")</span>
diff --git a/src/Orchard/Mvc/Html/ContentItemExtensions.cs b/src/Orchard/Mvc/Html/ContentItemExtensions.cs
index 4f30ea2a9..a6fc28281 100644
--- a/src/Orchard/Mvc/Html/ContentItemExtensions.cs
+++ b/src/Orchard/Mvc/Html/ContentItemExtensions.cs
@@ -7,11 +7,15 @@ using Orchard.Utility.Extensions;
 
 namespace Orchard.Mvc.Html {
     public static class ContentItemExtensions {
-        public static MvcHtmlString ItemDisplayText(this HtmlHelper html, IContent content) {
+        public static MvcHtmlString ItemDisplayText(this HtmlHelper html, IContent content, bool encode = true) {
             var metadata = content.ContentItem.ContentManager.GetItemMetadata(content);
             if (metadata.DisplayText == null)
                 return null;
-            return MvcHtmlString.Create(html.Encode(metadata.DisplayText));
+            if (encode) {
+                return MvcHtmlString.Create(html.Encode(metadata.DisplayText));
+            } else {
+                return MvcHtmlString.Create(metadata.DisplayText);
+            }
         }
 
         public static MvcHtmlString ItemDisplayLink(this HtmlHelper html, IContent content) {