Revert "Temp8 tinymce"

2018-11-22 14:05:51 +00:00
parent 2a0748fc1e
commit 54a2aa00a7
6677 changed files with 646351 additions and 410535 deletions
--- a/src/Umbraco.Web/CacheHelperExtensions.cs
+++ b/src/Umbraco.Web/CacheHelperExtensions.cs
@@ -1,62 +1,64 @@
-using System;
-using System.Web;
-using System.Web.Caching;
-using System.Web.Mvc;
-using System.Web.Mvc.Html;
-using Umbraco.Core.Cache;
-
-namespace Umbraco.Web
-{
-
-    /// <summary>
-    /// Extension methods for the cache helper
-    /// </summary>
-    public static class CacheHelperExtensions
-    {
-
-        public const string PartialViewCacheKey = "Umbraco.Web.PartialViewCacheKey";
-
-        /// <summary>
-        /// Outputs and caches a partial view in MVC
-        /// </summary>
-        /// <param name="cacheHelper"></param>
-        /// <param name="htmlHelper"></param>
-        /// <param name="partialViewName"></param>
-        /// <param name="model"></param>
-        /// <param name="cachedSeconds"></param>
-        /// <param name="cacheKey">used to cache the partial view, this key could change if it is cached by page or by member</param>
-        /// <param name="viewData"></param>
-        /// <returns></returns>
-        public static IHtmlString CachedPartialView(
-            this CacheHelper cacheHelper,
-            HtmlHelper htmlHelper,
-            string partialViewName,
-            object model,
-            int cachedSeconds,
-            string cacheKey,
-            ViewDataDictionary viewData = null)
-        {
-            //disable cached partials in debug mode: http://issues.umbraco.org/issue/U4-5940
-            if (htmlHelper.ViewContext.HttpContext.IsDebuggingEnabled)
-            {
-                // just return a normal partial view instead
-                return htmlHelper.Partial(partialViewName, model, viewData);
-            }
-
-            return cacheHelper.RuntimeCache.GetCacheItem<IHtmlString>(
-                PartialViewCacheKey + cacheKey,
-                () => htmlHelper.Partial(partialViewName, model, viewData),
-                priority: CacheItemPriority.NotRemovable, //not removable, the same as macros (apparently issue #27610)
-                timeout: new TimeSpan(0, 0, 0, cachedSeconds));
-        }
-
-        /// <summary>
-        /// Clears the cache for partial views
-        /// </summary>
-        /// <param name="cacheHelper"></param>
-        public static void ClearPartialViewCache(this CacheHelper cacheHelper)
-        {
-            cacheHelper.RuntimeCache.ClearCacheByKeySearch(PartialViewCacheKey);
-        }
-    }
-}
+using System;
+using System.Web;
+using System.Web.Caching;
+using System.Web.Mvc;
+using System.Web.Mvc.Html;
+using Umbraco.Core;
+using umbraco.cms.businesslogic.web;
+using Umbraco.Core.Cache;
+
+namespace Umbraco.Web
+{
+
+	/// <summary>
+	/// Extension methods for the cache helper
+	/// </summary>
+	public static class CacheHelperExtensions
+	{
+
+		public const string PartialViewCacheKey = "Umbraco.Web.PartialViewCacheKey";
+       
+		/// <summary>
+		/// Outputs and caches a partial view in MVC
+		/// </summary>
+		/// <param name="cacheHelper"></param>
+		/// <param name="htmlHelper"></param>
+		/// <param name="partialViewName"></param>
+		/// <param name="model"></param>
+		/// <param name="cachedSeconds"></param>
+		/// <param name="cacheKey">used to cache the partial view, this key could change if it is cached by page or by member</param>
+		/// <param name="viewData"></param>
+		/// <returns></returns>
+		public static IHtmlString CachedPartialView(
+			this CacheHelper cacheHelper,
+			HtmlHelper htmlHelper,
+			string partialViewName,
+			object model,
+			int cachedSeconds,
+			string cacheKey,
+			ViewDataDictionary viewData = null)
+		{
+            //disable cached partials in debug mode: http://issues.umbraco.org/issue/U4-5940
+            if (htmlHelper.ViewContext.HttpContext.IsDebuggingEnabled)
+            {
+                // just return a normal partial view instead
+                return htmlHelper.Partial(partialViewName, model, viewData);
+            }
+
+            return cacheHelper.RuntimeCache.GetCacheItem<IHtmlString>(
+				PartialViewCacheKey + cacheKey,
+                () => htmlHelper.Partial(partialViewName, model, viewData),
+				priority: CacheItemPriority.NotRemovable, //not removable, the same as macros (apparently issue #27610)
+				timeout: new TimeSpan(0, 0, 0, cachedSeconds));
+		}
+
+		/// <summary>
+		/// Clears the cache for partial views
+		/// </summary>
+		/// <param name="cacheHelper"></param>
+		public static void ClearPartialViewCache(this CacheHelper cacheHelper)
+		{
+			cacheHelper.RuntimeCache.ClearCacheByKeySearch(PartialViewCacheKey);
+		}
+	}
+}