Fixing some urls

OrchardCMS · Oct 3, 2017 · 86c4b20 · 86c4b20
1 parent 033d78b
commit 86c4b20
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/OrchardCore/OrchardCore.Environment.Navigation/NavigationHelper.cs b/src/OrchardCore/OrchardCore.Environment.Navigation/NavigationHelper.cs
@@ -68,7 +68,7 @@ public static void ApplySelection(MenuItem menuItem, dynamic menuItemShape, View
             bool match = menuItem.RouteValues != null && RouteMatches(menuItem.RouteValues, viewContext.RouteData.Values);
 
             // if route match failed, try comparing URL strings, if
-            if (!match && menuItem.Href != null)
+            if (!match && !String.IsNullOrWhiteSpace(menuItem.Href) && menuItem.Href != "#")
             {
                 string url = menuItem.Href.Replace("~/", viewContext.HttpContext.Request.PathBase);
                 match = viewContext.HttpContext.Request.Path.Equals(url, StringComparison.OrdinalIgnoreCase);

diff --git a/src/OrchardCore/OrchardCore.StorageProviders.FileSystem/FileSystemStore.cs b/src/OrchardCore/OrchardCore.StorageProviders.FileSystem/FileSystemStore.cs
@@ -18,7 +18,7 @@ public FileSystemStore(string localPath, string requestUrlPrefix, string pathPre
             _localPath = localPath;
             _requestUrlPrefix = String.IsNullOrWhiteSpace(requestUrlPrefix) ? "" : "/" + NormalizePath(requestUrlPrefix);
             _pathPrefix = pathPrefix;
-            _publicPathPrefix = Combine(_requestUrlPrefix, _pathPrefix);
+            _publicPathPrefix = String.IsNullOrEmpty(_requestUrlPrefix) ? _pathPrefix : Combine(_requestUrlPrefix, _pathPrefix);
         }
 
         public string Combine(params string[] paths)