From 90abe8c25f867bdc20622ef9bda82f949f9062ef Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 11 Sep 2013 12:15:29 +1000
Subject: [PATCH] Fixes: U4-2823 RenderRouteHandler.GetUmbracoRouteDefinition()
 fails to store the route definition when an incidental alias-controller match
 is made

---
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj  | 4 ++--
 src/Umbraco.Web/Mvc/RenderRouteHandler.cs | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index f9d60fbacb..02ddb3454b 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -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\" />
diff --git a/src/Umbraco.Web/Mvc/RenderRouteHandler.cs b/src/Umbraco.Web/Mvc/RenderRouteHandler.cs
index 1ebfebf1e4..56c4059f95 100644
--- a/src/Umbraco.Web/Mvc/RenderRouteHandler.cs
+++ b/src/Umbraco.Web/Mvc/RenderRouteHandler.cs
@@ -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.
 		        }
 		    }