diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Extensions/UrlHelperExtensions.cs b/src/Orchard.Web/Modules/Orchard.Blogs/Extensions/UrlHelperExtensions.cs index 4a0d5e1db..0d65260bc 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Extensions/UrlHelperExtensions.cs +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Extensions/UrlHelperExtensions.cs @@ -1,5 +1,6 @@ using System.Web.Mvc; using Orchard.Blogs.Models; +using Orchard.Mvc.Extensions; namespace Orchard.Blogs.Extensions { public static class UrlHelperExtensions { @@ -16,11 +17,11 @@ namespace Orchard.Blogs.Extensions { } public static string BlogLiveWriterManifest(this UrlHelper urlHelper, string blogSlug) { - return urlHelper.Action("LiveWriterManifest", "Blog", new { blogSlug, area = "Orchard.Blogs" }); + return urlHelper.AbsoluteAction(() => urlHelper.Action("LiveWriterManifest", "Blog", new { blogSlug, area = "Orchard.Blogs" })); } public static string BlogRsd(this UrlHelper urlHelper, string blogSlug) { - return urlHelper.Action("Rsd", "Blog", new { blogSlug, area = "Orchard.Blogs" }); + return urlHelper.AbsoluteAction(() => urlHelper.Action("Rsd", "Blog", new { blogSlug, area = "Orchard.Blogs" })); } public static string BlogArchiveYear(this UrlHelper urlHelper, string blogSlug, int year) { diff --git a/src/Orchard/Mvc/ViewModels/AdaptedViewModel.cs b/src/Orchard/Mvc/ViewModels/AdaptedViewModel.cs index ad797b95c..926709ee3 100644 --- a/src/Orchard/Mvc/ViewModels/AdaptedViewModel.cs +++ b/src/Orchard/Mvc/ViewModels/AdaptedViewModel.cs @@ -42,11 +42,15 @@ namespace Orchard.Mvc.ViewModels { public TProperty Value { get { if (_value == null && _builder != null) { - _value = _original.Eval(_expression) as TProperty; - if (_value == null) + object temp; + if (_original.TryGetValue(_expression, out temp) && + temp is TProperty) { + SetValue(temp as TProperty); + } + else { SetValue(_builder()); + } } - return _value; } set { SetValue(value); } diff --git a/src/Orchard/UI/Resources/ResourceManager.cs b/src/Orchard/UI/Resources/ResourceManager.cs index c603d636f..657dc0a08 100644 --- a/src/Orchard/UI/Resources/ResourceManager.cs +++ b/src/Orchard/UI/Resources/ResourceManager.cs @@ -118,7 +118,6 @@ namespace Orchard.UI.Resources { if (!string.IsNullOrEmpty(link.Href)) { sb .Append(@" href=""") - .Append(@"http://localhost:30320") .Append(html.AttributeEncode(link.Href)) .Append(@""""); }