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

merge with 6.1.0

Browse Source
This commit is contained in:
Stephan
2013-04-05 10:28:50 -02:00
parent 49a61c5820 2f9de56968
commit cd823db766
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/Umbraco.Web/UmbracoContext.cs
View File

@@ -29,6 +29,7 @@ namespace Umbraco.Web
private const string HttpContextItemName = "Umbraco.Web.UmbracoContext";
private static readonly object Locker = new object();
private bool _replacing;
private PreviewContent _previewContent;
/// <summary>
@@ -78,8 +79,12 @@ namespace Umbraco.Web
/// </remarks>
public static UmbracoContext EnsureContext(HttpContextBase httpContext, ApplicationContext applicationContext, bool replaceContext)
{
if (UmbracoContext.Current != null && !replaceContext)
return UmbracoContext.Current;
if (UmbracoContext.Current != null)
{
if (!replaceContext)
return UmbracoContext.Current;
UmbracoContext.Current._replacing = true;
}
var umbracoContext = new UmbracoContext(
httpContext,
@@ -179,9 +184,9 @@ namespace Umbraco.Web
lock (Locker)
{
//if running in a real HttpContext, this can only be set once
if (System.Web.HttpContext.Current != null && Current != null)
if (System.Web.HttpContext.Current != null && Current != null && !Current._replacing)
{
throw new ApplicationException("The current httpContext can only be set once during a request.");
throw new ApplicationException("The current UmbracoContext can only be set once during a request.");
}
//if there is an HttpContext, return the item