U4-9322 - filesystems & cleanup

2017-02-03 20:01:43 +01:00
parent 478ca30948
commit 820069d5d5
18 changed files with 664 additions and 251 deletions
--- a/src/Umbraco.Core/ApplicationContext.cs
+++ b/src/Umbraco.Core/ApplicationContext.cs
@@ -164,7 +164,7 @@ namespace Umbraco.Core
    	public static ApplicationContext Current { get; internal set; }

        // fixme
-        internal IScopeProvider ScopeProvider { get { return DatabaseContext.ScopeProvider; } }
+        internal IScopeProvider ScopeProvider { get { return _databaseContext == null ? null : _databaseContext.ScopeProvider; } }

 		/// <summary>
 		/// Returns the application wide cache accessor