Fix merge

2018-12-21 16:25:16 +01:00
parent a60fd1b7be
commit f21dbb3e77
4 changed files with 99 additions and 83 deletions
--- a/src/Umbraco.Web/Runtime/WebRuntime.cs
+++ b/src/Umbraco.Web/Runtime/WebRuntime.cs
@@ -57,7 +57,7 @@ namespace Umbraco.Web.Runtime

        #region Getters

-        protected override IProfiler GetProfiler() => new WebProfiler();
+        protected override IProfiler GetProfiler() => _webProfiler;

        protected override CacheHelper GetAppCaches() => new CacheHelper(
                // we need to have the dep clone runtime cache provider to ensure