- Fixing OrchardControllerFactory.GetAreaName to align it with what MVC 2 does internally.

--HG--
branch : dev

src/Orchard/Mvc/OrchardControllerFactory.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Web.Mvc;
 using System.Web.Routing;
 using Autofac;
@@ -27,14 +26,29 @@ namespace Orchard.Mvc {
             return base.CreateController(requestContext, controllerName);
         }
 
-        private string GetAreaName(RouteData context) {
+        public static string GetAreaName(RouteBase route) {
-            object area;
+            var routeWithArea = route as IRouteWithArea;
-            if (context.Values.TryGetValue("area", out area)) {
+            if (routeWithArea != null) {
-                return Convert.ToString(area);
+                return routeWithArea.Area;
             }
+
+            var castRoute = route as Route;
+            if (castRoute != null && castRoute.DataTokens != null) {
+                return castRoute.DataTokens["area"] as string;
+            }
+
             return null;
         }
 
+        public static string GetAreaName(RouteData routeData) {
+            object area;
+            if (routeData.DataTokens.TryGetValue("area", out area)) {
+                return area as string;
+            }
+
+            return GetAreaName(routeData.Route);
+        }
+
         public static IContainer GetRequestContainer(RouteData routeData) {
             object dataTokenValue;
             if (routeData != null &&