yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '6.1.2' into 7.0.0

Browse Source 
Conflicts:
	src/Umbraco.Web/WebBootManager.cs
This commit is contained in:
Shannon
2013-06-18 15:47:56 +10:00
parent 93fa4c0447 273c1956ab
commit feeba0e6f9
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Umbraco.Web/WebBootManager.cs
View File

@@ -210,8 +210,8 @@ namespace Umbraco.Web
var meta = PluginController.GetMetadata(controller);
var route = RouteTable.Routes.MapHttpRoute(
string.Format("umbraco-{0}-{1}", "api", meta.ControllerName),
umbracoPath + "/Api/" + meta.ControllerName + "/{action}/{id}",//url to match
new { controller = meta.ControllerName, id = UrlParameter.Optional });
umbracoPath + "/Api/" + meta.ControllerName + "/{action}/{id}", //url to match
new {controller = meta.ControllerName, id = UrlParameter.Optional});
//web api routes don't set the data tokens object
if (route.DataTokens == null)
{