Merge remote-tracking branch 'origin/6.2.0' into 7.0.2

2014-01-15 13:37:46 +11:00
parent f27a0c0461 5c614a88a2
commit fd682efdb1
4 changed files with 16 additions and 11 deletions
--- a/src/Umbraco.Web/Mvc/PluginControllerArea.cs
+++ b/src/Umbraco.Web/Mvc/PluginControllerArea.cs
@@ -85,7 +85,9 @@ namespace Umbraco.Web.Mvc
        {
            foreach (var s in apiControllers)
            {
-                this.RouteControllerPlugin(s.ControllerName, s.ControllerType, routes, "", "", UrlParameter.Optional, "api", isMvc: false);
+                this.RouteControllerPlugin(s.ControllerName, s.ControllerType, routes, "", "", UrlParameter.Optional, "api", 
+                    isMvc: false, 
+                    areaPathPrefix: s.IsBackOffice ? "backoffice" : null);
            }
        }
 	}