From f7c474ac2c539af2d61b3eb5cc0c3e50f6a30efd Mon Sep 17 00:00:00 2001 From: Shannon Date: Tue, 18 Jun 2013 15:24:44 +1000 Subject: [PATCH] fixed merge issue and ensures UseNamespaceFallback are set for plugin controllers. --- src/Umbraco.Web/WebBootManager.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Umbraco.Web/WebBootManager.cs b/src/Umbraco.Web/WebBootManager.cs index 830fe35cdd..94384aaca4 100644 --- a/src/Umbraco.Web/WebBootManager.cs +++ b/src/Umbraco.Web/WebBootManager.cs @@ -218,6 +218,7 @@ namespace Umbraco.Web route.DataTokens = new RouteValueDictionary(); } route.DataTokens.Add("Namespaces", new[] {meta.ControllerNamespace}); //look in this namespace to create the controller + route.DataTokens.Add("UseNamespaceFallback", false); //Don't look anywhere else except this namespace! route.DataTokens.Add("umbraco", "api"); //ensure the umbraco token is set } private void RouteLocalSurfaceController(Type controller, string umbracoPath) @@ -229,6 +230,7 @@ namespace Umbraco.Web new { controller = meta.ControllerName, action = "Index", id = UrlParameter.Optional }, new[] { meta.ControllerNamespace }); //look in this namespace to create the controller route.DataTokens.Add("umbraco", "surface"); //ensure the umbraco token is set + route.DataTokens.Add("UseNamespaceFallback", false); //Don't look anywhere else except this namespace! //make it use our custom/special SurfaceMvcHandler route.RouteHandler = new SurfaceRouteHandler(); }