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

Merge dev-v7.6 into dev-v8

Browse Source
This commit is contained in:
Stephan
2016-12-14 14:06:30 +01:00
parent 04066e901f 4863052a08
commit 07a05317ff
44 changed files with 1067 additions and 453 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Umbraco.Web/UmbracoModule.cs
View File

@@ -550,7 +550,7 @@ namespace Umbraco.Web
OnEndRequest(new UmbracoRequestEventArgs(UmbracoContext.Current, new HttpContextWrapper(httpContext)));
DisposeHttpContextItems(httpContext);
DisposeHttpContextItems(httpContext);
};
}
@@ -568,9 +568,9 @@ namespace Umbraco.Web
RouteAttempt?.Invoke(this, args);
}
public static event EventHandler<EventArgs> EndRequest;
public static event EventHandler<UmbracoRequestEventArgs> EndRequest;
private void OnEndRequest(EventArgs args)
private void OnEndRequest(UmbracoRequestEventArgs args)
{
EndRequest?.Invoke(this, args);
}