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

Shazwazza · Shazwazza · commit 0714aaa457a1 · 2014-01-24T12:34:40.000+11:00
diff --git a/src/Umbraco.Web.UI/config/splashes/booting.aspx b/src/Umbraco.Web.UI/config/splashes/booting.aspx
@@ -2,7 +2,7 @@
 
 <%
     // NH: Adds this inline check to avoid a simple codebehind file in the legacy project!
-    if (!umbraco.cms.helpers.url.ValidateProxyUrl(Request["url"], Request.Url.AbsoluteUri))
+    if (Request["url"].ToLower().Contains("booting.aspx") || !umbraco.cms.helpers.url.ValidateProxyUrl(Request["url"], Request.Url.AbsoluteUri))
     {
         throw new ArgumentException("Can't redirect to the requested url - it's not local or an approved proxy url",
                                     "url");

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`<%`
`4`	`4`	`// NH: Adds this inline check to avoid a simple codebehind file in the legacy project!`
`5`		`- if (!umbraco.cms.helpers.url.ValidateProxyUrl(Request["url"], Request.Url.AbsoluteUri))`
	`5`	`+ if (Request["url"].ToLower().Contains("booting.aspx") \|\| !umbraco.cms.helpers.url.ValidateProxyUrl(Request["url"], Request.Url.AbsoluteUri))`
`6`	`6`	`{`
`7`	`7`	`throw new ArgumentException("Can't redirect to the requested url - it's not local or an approved proxy url",`
`8`	`8`	`"url");`