From bf59d1fca80bc66878a35e6ae407402d078ad865 Mon Sep 17 00:00:00 2001
From: neehouse <unknown@kiln.example.com>
Date: Mon, 19 Sep 2011 21:00:48 +0400
Subject: [PATCH] Clear response before redirect on ensured pages and end
 response on transfer.

---
 umbraco/businesslogic/BasePages/UmbracoEnsuredPage.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/umbraco/businesslogic/BasePages/UmbracoEnsuredPage.cs b/umbraco/businesslogic/BasePages/UmbracoEnsuredPage.cs
index c7499d6856..d64fe79dc3 100644
--- a/umbraco/businesslogic/BasePages/UmbracoEnsuredPage.cs
+++ b/umbraco/businesslogic/BasePages/UmbracoEnsuredPage.cs
@@ -101,11 +101,14 @@ namespace umbraco.BasePages
             }
             catch
             {
+                // Clear content as .NET transfers rendered content.
+                Response.Clear();
+
                 // Some umbraco pages should not be loaded on timeout, but instead reload the main application in the top window. Like the treeview for instance
                 if (RedirectToUmbraco)
-                    Response.Redirect(SystemDirectories.Umbraco + "/logout.aspx?");
+                    Response.Redirect(SystemDirectories.Umbraco + "/logout.aspx?", true);
                 else
-                    Response.Redirect(SystemDirectories.Umbraco + "/logout.aspx?redir=" + Server.UrlEncode(Request.RawUrl));
+                    Response.Redirect(SystemDirectories.Umbraco + "/logout.aspx?redir=" + Server.UrlEncode(Request.RawUrl), true);
             }
 
             System.Threading.Thread.CurrentThread.CurrentCulture = new System.Globalization.CultureInfo(ui.Culture(this.getUser()));