Merge remote-tracking branch 'origin/6.2.0' into 7.0.2

Conflicts: src/Umbraco.Core/Profiling/ProfilingViewEngine.cs
2013-12-19 12:53:32 +11:00
parent 3a1dbc778b 5c59317bf8
commit f7b61d09e2
9 changed files with 176 additions and 26 deletions
--- a/src/Umbraco.Web/CacheHelperExtensions.cs
+++ b/src/Umbraco.Web/CacheHelperExtensions.cs
@@ -12,7 +12,7 @@ namespace Umbraco.Web
 	/// <summary>
 	/// Extension methods for the cache helper
 	/// </summary>
-	internal static class CacheHelperExtensions
+	public static class CacheHelperExtensions
 	{

 		public const string PartialViewCacheKey = "Umbraco.Web.PartialViewCacheKey";
@@ -54,4 +54,4 @@ namespace Umbraco.Web
 			cacheHelper.ClearCacheByKeySearch(PartialViewCacheKey);
 		}
 	}
-}
+}