From 571f89bbe37c281624360bc49028c3f91a0e42c7 Mon Sep 17 00:00:00 2001 From: PerPloug Date: Wed, 12 Jan 2011 13:58:08 -0100 Subject: [PATCH] Recommit of TinyMCE for media and members --- .../editorControls/tinyMCE3/webcontrol/TinyMCEWebControl.cs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/components/editorControls/tinyMCE3/webcontrol/TinyMCEWebControl.cs b/components/editorControls/tinyMCE3/webcontrol/TinyMCEWebControl.cs index c95cfc8596..5af8d9ba84 100644 --- a/components/editorControls/tinyMCE3/webcontrol/TinyMCEWebControl.cs +++ b/components/editorControls/tinyMCE3/webcontrol/TinyMCEWebControl.cs @@ -446,10 +446,12 @@ namespace umbraco.editorControls.tinyMCE3.webcontrol string pattern = @"(<\?UMBRACO_MACRO\W*[^>]*/>)"; MatchCollection tags = - Regex.Matches(content, pattern, RegexOptions.IgnoreCase | RegexOptions.IgnorePatternWhitespace); + Regex.Matches(content, pattern, RegexOptions.IgnoreCase | RegexOptions.IgnorePatternWhitespace); // Page for macro rendering -// page p = new page(nodeId, versionId); +// page p = new page(nodeId, versionId); + + System.Web.HttpContext.Current.Items["macrosAdded"] = 0; System.Web.HttpContext.Current.Items["pageID"] = nodeId.ToString();