From 93d0f2cb22c145003cd88b4465c557c5ceab3c78 Mon Sep 17 00:00:00 2001 From: Nathan Heskew Date: Tue, 9 Mar 2010 02:59:45 -0800 Subject: [PATCH] Refixed the homepage link and fixed the tests that were broken - Added an ApplicationPath override to the StubHttpRequest --HG-- branch : dev --- src/Orchard.Tests/Stubs/StubHttpContext.cs | 4 ++++ src/Orchard/UI/Navigation/NavigationManager.cs | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Orchard.Tests/Stubs/StubHttpContext.cs b/src/Orchard.Tests/Stubs/StubHttpContext.cs index b2becb8f4..5439a5c79 100644 --- a/src/Orchard.Tests/Stubs/StubHttpContext.cs +++ b/src/Orchard.Tests/Stubs/StubHttpContext.cs @@ -34,6 +34,10 @@ namespace Orchard.Tests.Stubs { get { return _appRelativeCurrentExecutionFilePath; } } + public override string ApplicationPath { + get { return "/"; } + } + public override string PathInfo { get { return ""; } } diff --git a/src/Orchard/UI/Navigation/NavigationManager.cs b/src/Orchard/UI/Navigation/NavigationManager.cs index 8ba4e17af..ecf5120aa 100644 --- a/src/Orchard/UI/Navigation/NavigationManager.cs +++ b/src/Orchard/UI/Navigation/NavigationManager.cs @@ -35,7 +35,7 @@ namespace Orchard.UI.Navigation { public string GetUrl(string menuItemUrl, RouteValueDictionary routeValueDictionary) { var url = string.IsNullOrEmpty(menuItemUrl) && (routeValueDictionary == null || routeValueDictionary.Count == 0) - ? null + ? "~/" : !string.IsNullOrEmpty(menuItemUrl) ? menuItemUrl : _urlHelper.RouteUrl(routeValueDictionary);