yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes 26260, 26571 and 26572 (issues with clearing cookies, ending preview mode and adding trace/header messages about running in preview mode)

Browse Source 
[TFS Changeset #64976]
This commit is contained in:
hartvig
2010-03-25 10:14:54 +00:00
parent f7e71efa54
commit 588e3a6e87
2 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
umbraco/presentation/default.aspx.cs
View File

@@ -43,20 +43,8 @@ namespace umbraco
pageContents = template.ParseInternalLinks(pageContents);
// Parse javascript without types
// NH 15.07.08 - Why should we do that on every page when people should fix their templates instead.
// pageContents =
// pageContents.Replace("<script language=\"javascript\">", "<script language=\"javascript\" type=\"text/javascript\">");
output.Write(pageContents);
//// Parse form name
//if (HttpContext.Current.Items["VirtualUrl"] != null) {
// Regex formReplace = new Regex("action=\"default.aspx([^\"]*)\"");
// if (formReplace.ToString() != "")
// output.Write(
// formReplace.Replace(pageContents, "action=\"" + Convert.ToString(HttpContext.Current.Items["VirtualUrl"]) + "\""));
//} else
// base.Render(output);
}
void Page_PreInit(Object sender, EventArgs e)
@@ -156,7 +144,18 @@ namespace umbraco
else
Page.Trace.IsEnabled = false;
// In preview mode?
if (UmbracoContext.Current.InPreviewMode)
{
Trace.Write("Runtime Engine", "Umbraco is running in preview mode.");
if (Page.Header != null)
{
Page.Header.Controls.AddAt(0,
new LiteralControl(String.Format("{0}{0}<!-- {0}THE FOLLOW IS AUTOMATICALLY INSERTED BY UMBRACO:{0}{0}Umbraco is running in preview mode. {0}To end preview mode, simply refresh the editing view in the Back Office or log out of Umbraco.{0}{0}This message is only shown to authenticated users of Umbraco. Never to your visitors!{0}{0}-->{0}{0}", Environment.NewLine)));
}
}
}