From 655964f11bb4fb08f1dd83fe6f10565cd3910524 Mon Sep 17 00:00:00 2001
From: Morten Christensen <unknown@kiln.example.com>
Date: Sat, 29 Dec 2012 18:18:49 -0100
Subject: [PATCH] Fixing up a few path issues after having changed
 FullpathToRoot in GlobalSettings. Corrected the path concat of path +
 web.config file.

---
 src/Umbraco.Core/Configuration/GlobalSettings.cs | 4 ++--
 src/Umbraco.Core/DatabaseContext.cs              | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Core/Configuration/GlobalSettings.cs b/src/Umbraco.Core/Configuration/GlobalSettings.cs
index 855745244f..a668ffd0a1 100644
--- a/src/Umbraco.Core/Configuration/GlobalSettings.cs
+++ b/src/Umbraco.Core/Configuration/GlobalSettings.cs
@@ -201,7 +201,7 @@ namespace Umbraco.Core.Configuration
                 }
             }
 
-            string fileName = String.Concat(vDir, "web.config");
+            string fileName = System.IO.Path.Combine(vDir, "web.config");
             var xml = XDocument.Load(fileName, LoadOptions.PreserveWhitespace);
             
             var appSettings = xml.Root.Descendants("appSettings").Single();
@@ -223,7 +223,7 @@ namespace Umbraco.Core.Configuration
         /// <value>The fullpath to root.</value>
         public static string FullpathToRoot
         {
-            get { return IOHelper.GetRootDirectorySafe() + System.IO.Path.DirectorySeparatorChar; }
+            get { return IOHelper.GetRootDirectorySafe(); }
         }
 
         /// <summary>
diff --git a/src/Umbraco.Core/DatabaseContext.cs b/src/Umbraco.Core/DatabaseContext.cs
index 75931ba89b..b0420218fc 100644
--- a/src/Umbraco.Core/DatabaseContext.cs
+++ b/src/Umbraco.Core/DatabaseContext.cs
@@ -207,7 +207,7 @@ namespace Umbraco.Core
                 }
             }
 
-            string fileName = String.Concat(vDir, "web.config");
+            string fileName = System.IO.Path.Combine(vDir, "web.config");
             var xml = XDocument.Load(fileName, LoadOptions.PreserveWhitespace);
             var connectionstrings = xml.Root.Descendants("connectionStrings").Single();