From a950acbaba5caf6eeb9d15c661d74eed61186aa4 Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Mon, 24 Aug 2015 17:25:44 +0200
Subject: [PATCH] U4-7002 - ToAppRelative is too greedy

---
 src/Umbraco.Web/UriUtility.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web/UriUtility.cs b/src/Umbraco.Web/UriUtility.cs
index 86a97e2857..8a1c55e758 100644
--- a/src/Umbraco.Web/UriUtility.cs
+++ b/src/Umbraco.Web/UriUtility.cs
@@ -51,7 +51,8 @@ namespace Umbraco.Web
 		// see also VirtualPathUtility.ToAppRelative
         public static string ToAppRelative(string virtualPath)
         {
-            if (virtualPath.InvariantStartsWith(_appPathPrefix))
+            if (virtualPath.InvariantStartsWith(_appPathPrefix)
+                    && (virtualPath.Length == _appPathPrefix.Length || virtualPath[_appPathPrefix.Length] == '/'))
                 virtualPath = virtualPath.Substring(_appPathPrefix.Length);
 			if (virtualPath.Length == 0)
 				virtualPath = "/";