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

Fixes: #U4-1717 - UmbracoContext.EnsuresContext is public.

Browse Source
This commit is contained in:
Shannon Deminick
2013-03-22 05:23:11 +06:00
parent 8cdfba42d5
commit 7e0c1fac36
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -48,10 +48,9 @@ namespace Umbraco.Web
/// This is created in order to standardize the creation of the singleton. Normally it is created during a request
/// in the UmbracoModule, however this module does not execute during application startup so we need to ensure it
/// during the startup process as well.
/// See: http://issues.umbraco.org/issue/U4-1890
/// See: http://issues.umbraco.org/issue/U4-1890, http://issues.umbraco.org/issue/U4-1717
/// </remarks>
[UmbracoProposedPublic("http://issues.umbraco.org/issue/U4-1717")]
internal static UmbracoContext EnsureContext(HttpContextBase httpContext, ApplicationContext applicationContext)
public static UmbracoContext EnsureContext(HttpContextBase httpContext, ApplicationContext applicationContext)
{
return EnsureContext(httpContext, applicationContext, false);
}
@@ -74,9 +73,9 @@ namespace Umbraco.Web
/// This is created in order to standardize the creation of the singleton. Normally it is created during a request
/// in the UmbracoModule, however this module does not execute during application startup so we need to ensure it
/// during the startup process as well.
/// See: http://issues.umbraco.org/issue/U4-1890
/// See: http://issues.umbraco.org/issue/U4-1890, http://issues.umbraco.org/issue/U4-1717
/// </remarks>
internal static UmbracoContext EnsureContext(HttpContextBase httpContext, ApplicationContext applicationContext, bool replaceContext)
public static UmbracoContext EnsureContext(HttpContextBase httpContext, ApplicationContext applicationContext, bool replaceContext)
{
if (UmbracoContext.Current != null && !replaceContext)
return UmbracoContext.Current;