Fixes: U4-2823 RenderRouteHandler.GetUmbracoRouteDefinition() fails to store the route definition when an incidental alias-controller match is made

This commit is contained in:
Shannon
2013-09-11 12:15:29 +10:00
parent 9f1d212375
commit 90abe8c25f
2 changed files with 5 additions and 4 deletions

View File

@@ -2608,8 +2608,8 @@
<Folder Include="MasterPages\" />
<Folder Include="Media\" />
<Folder Include="Scripts\" />
<Folder Include="Umbraco_client\FolderBrowser\Images\" />
<Folder Include="Umbraco_client\Tags\images\" />
<Folder Include="Umbraco_Client\FolderBrowser\Images\" />
<Folder Include="Umbraco_Client\Tags\images\" />
<Folder Include="UserControls\" />
<Folder Include="Views\MacroPartials\" />
<Folder Include="Views\Partials\" />

View File

@@ -305,8 +305,9 @@ namespace Umbraco.Web.Mvc
() => controllerType.FullName,
() => typeof(IRenderMvcController).FullName,
() => typeof(ControllerBase).FullName);
//exit as we cannnot route to the custom controller, just route to the standard one.
return def;
//we cannot route to this custom controller since it is not of the correct type so we'll continue with the defaults
// that have already been set above.
}
}