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

Merge branch 'dev-v7' into 7.3.0

Browse Source 
Conflicts:
	src/Umbraco.Core/ApplicationContext.cs
	src/Umbraco.Core/Logging/LogHelper.cs
	src/Umbraco.Web.UI.Client/src/less/login.less
	src/Umbraco.Web/Scheduling/BackgroundTaskRunner.cs
This commit is contained in:
Stephan
2015-05-18 16:23:12 +02:00
parent 25f9fecc16 3b791c75f6
commit 031f70f529
8 changed files with 155 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -372,15 +372,23 @@ namespace Umbraco.Web
return false;
}
private bool _notConfiguredReported;
// ensures Umbraco is configured
// if not, redirect to install and return false
// if yes, return true
private static bool EnsureIsConfigured(HttpContextBase httpContext, Uri uri)
private bool EnsureIsConfigured(HttpContextBase httpContext, Uri uri)
{
if (ApplicationContext.Current.IsConfigured)
return true;
LogHelper.Warn<UmbracoModule>("Umbraco is not configured");
if (_notConfiguredReported)
{
// remember it's been reported so we don't flood the log
// no thread-safety so there may be a few log entries, doesn't matter
_notConfiguredReported = true;
LogHelper.Warn<UmbracoModule>("Umbraco is not configured");
}
var installPath = UriUtility.ToAbsolute(SystemDirectories.Install);
var installUrl = string.Format("{0}/?redir=true&url={1}", installPath, HttpUtility.UrlEncode(uri.ToString()));