diff --git a/src/Orchard.Web/Core/Contents/Views/EditorTemplates/Items/Contents.Item.ascx b/src/Orchard.Web/Core/Contents/Views/EditorTemplates/Items/Contents.Item.ascx
index 5e0cc4986..0e431bd8e 100644
--- a/src/Orchard.Web/Core/Contents/Views/EditorTemplates/Items/Contents.Item.ascx
+++ b/src/Orchard.Web/Core/Contents/Views/EditorTemplates/Items/Contents.Item.ascx
@@ -8,7 +8,7 @@
-
<%: Html.Link(s, Url.BlogPostEdit(Model.Item))%>
+
<%: Html.Link(Model.Item.Title, Url.BlogPostEdit(Model.Item))%>
<%
if (Model.Item.HasPublished) { %>
diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Views/Admin/Index.aspx b/src/Orchard.Web/Modules/Orchard.Comments/Views/Admin/Index.aspx
index fc464f3aa..689fe4eba 100644
--- a/src/Orchard.Web/Modules/Orchard.Comments/Views/Admin/Index.aspx
+++ b/src/Orchard.Web/Modules/Orchard.Comments/Views/Admin/Index.aspx
@@ -7,7 +7,7 @@
<%: T("Actions:") %>
- <%: Html.SelectOption(Model.Options.BulkAction, CommentIndexBulkAction.None, T("Choose action...")) %>
+ <%: Html.SelectOption(Model.Options.BulkAction, CommentIndexBulkAction.None, T("Choose action...").ToString()) %>
<%: Html.SelectOption(Model.Options.BulkAction, CommentIndexBulkAction.Approve, T("Approve")) %>
<%: Html.SelectOption(Model.Options.BulkAction, CommentIndexBulkAction.Pend, T("Pend")) %>
<%: Html.SelectOption(Model.Options.BulkAction, CommentIndexBulkAction.MarkAsSpam, T("Mark as Spam")) %>
diff --git a/src/Orchard.Web/Modules/Orchard.DevTools/Views/Metadata/Index.aspx b/src/Orchard.Web/Modules/Orchard.DevTools/Views/Metadata/Index.aspx
index 7c119bf89..b4859c8f3 100644
--- a/src/Orchard.Web/Modules/Orchard.DevTools/Views/Metadata/Index.aspx
+++ b/src/Orchard.Web/Modules/Orchard.DevTools/Views/Metadata/Index.aspx
@@ -40,5 +40,5 @@ Exported as xml
<% using (Html.BeginFormAntiForgeryPost()) { %>
<%:Html.TextAreaFor(m=>m.ExportText, new{style="width:100%;height:640px;"}) %>
- " />
+ " />
<%} %>
diff --git a/src/Orchard.Web/Modules/Orchard.MetaData/Views/Admin/ContentTypeList.ascx b/src/Orchard.Web/Modules/Orchard.MetaData/Views/Admin/ContentTypeList.ascx
index c0b78eead..f1a53e532 100644
--- a/src/Orchard.Web/Modules/Orchard.MetaData/Views/Admin/ContentTypeList.ascx
+++ b/src/Orchard.Web/Modules/Orchard.MetaData/Views/Admin/ContentTypeList.ascx
@@ -68,7 +68,7 @@ using (Html.BeginFormAntiForgeryPost(Url.Action("Save",new {id=Model.SelectedCon
- " />
+ " />
<% } %>
diff --git a/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Features.ascx b/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Features.ascx
index 42c12be5b..bf4b9d41d 100644
--- a/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Features.ascx
+++ b/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Features.ascx
@@ -43,7 +43,7 @@
<%: T("Depends on:")%>
<%: Html.UnorderedList(
feature.Descriptor.Dependencies.OrderBy(s => s),
- (s, i) => Html.Link(s, string.Format("#{0}", s.AsFeatureId(n => T(n)))),
+ (s, i) => Html.Link(s, string.Format("#{0}", s.AsFeatureId(n => T(n)))).ToString(),
"",
"dependency",
"") %>
diff --git a/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Index.ascx b/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Index.ascx
index 3ffb531c2..2c700a65a 100644
--- a/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Index.ascx
+++ b/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Index.ascx
@@ -15,7 +15,7 @@
<%: module.Description %>
<%
} %>
- <%=T("Features: {0}", string.Join(", ", module.Features.Select(f => Html.Link(f.Name, string.Format("{0}#{1}", Url.Action("features", new { area = "Orchard.Modules" }), f.Name.AsFeatureId(n => T(n))) )).OrderBy(s => s).ToArray())) %>
+ <%=T("Features: {0}", string.Join(", ", module.Features.Select(f => Html.Link(f.Name, string.Format("{0}#{1}", Url.Action("features", new { area = "Orchard.Modules" }), f.Name.AsFeatureId(n => T(n)))).ToString()).OrderBy(s => s).ToArray())) %>
| <%: T("Author: {0}", !string.IsNullOrEmpty(module.Author) ? module.Author : (new []{"Bradley", "Bertrand", "Renaud", "Suha", "Sebastien", "Jon", "Nathan", "Erik"})[(module.DisplayName.Length + (new Random()).Next()) % 7]) %> <%-- very efficient, I know --%>
| <%: T("Website: {0}", !string.IsNullOrEmpty(module.HomePage) ? module.HomePage : T("http://orchardproject.net ").ToString())%>
diff --git a/src/Orchard/Localization/LocalizedString.cs b/src/Orchard/Localization/LocalizedString.cs
index 8197f4219..60e1c85dc 100644
--- a/src/Orchard/Localization/LocalizedString.cs
+++ b/src/Orchard/Localization/LocalizedString.cs
@@ -12,6 +12,10 @@ namespace Orchard.Localization {
return new LocalizedString(x);
}
+ public static implicit operator string(LocalizedString x) {
+ return x.ToString();
+ }
+
public string Text {
get { return _localized; }
}
diff --git a/src/Tools/MSBuild.Orchard.Tasks.Tests/TestData/SimpleWebProject.xml b/src/Tools/MSBuild.Orchard.Tasks.Tests/TestData/SimpleWebProject.xml
index 025df4ecb..a1ccc32c1 100644
--- a/src/Tools/MSBuild.Orchard.Tasks.Tests/TestData/SimpleWebProject.xml
+++ b/src/Tools/MSBuild.Orchard.Tasks.Tests/TestData/SimpleWebProject.xml
@@ -11,7 +11,7 @@
Orchard.Web
Orchard.Web
v3.5
-
false
+
true
true