Merge with 4.11.6

2013-03-15 08:06:26 +04:00
parent c4aa9095f2 04b9607741
commit 23146cb12a
5 changed files with 37 additions and 8 deletions
--- a/src/Umbraco.Core/IO/SystemDirectories.cs
+++ b/src/Umbraco.Core/IO/SystemDirectories.cs
@@ -183,16 +183,26 @@ namespace Umbraco.Core.IO
            }
        }

+	    private static string _root;
+        /// <summary>
+        /// Gets the root path of the application
+        /// </summary>
        public static string Root
        {
            get
            {
-                string appPath = HttpRuntime.AppDomainAppVirtualPath ?? string.Empty;
-                if (appPath == "/")
-                    appPath = string.Empty;
+                if (_root == null)
+                {
+                    string appPath = HttpRuntime.AppDomainAppVirtualPath ?? string.Empty;
+                    if (appPath == "/")
+                        appPath = string.Empty;

-                return appPath;
+                    _root = appPath;    
+                }
+                return _root;
            }
+            //Only required for unit tests
+            internal set { _root = value; }
        }
    }