From e2cee9e99d3b01d4709ee5f8011428f77cd227d6 Mon Sep 17 00:00:00 2001
From: hartvig <unknown@kiln.example.com>
Date: Tue, 22 Feb 2011 11:21:22 -0100
Subject: [PATCH] Work items: 29972

---
 umbraco/presentation/umbraco/editContent.aspx.cs | 4 +++-
 umbraco/presentation/web.config                  | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/umbraco/presentation/umbraco/editContent.aspx.cs b/umbraco/presentation/umbraco/editContent.aspx.cs
index 87c6ae31d4..de41134c62 100644
--- a/umbraco/presentation/umbraco/editContent.aspx.cs
+++ b/umbraco/presentation/umbraco/editContent.aspx.cs
@@ -382,7 +382,9 @@ namespace umbraco.cms.presentation
                                         tempLink = "<em>N/A</em>";
                                     else if (int.Parse(s) != _document.Id)
                                     {
-                                        string niceUrl = currentLink.Replace(library.NiceUrl(int.Parse(s)).Replace(".aspx", ""), "");
+                                        string tempNiceUrl = library.NiceUrl(int.Parse(s));
+
+                                        string niceUrl = tempNiceUrl != "/" ? currentLink.Replace(tempNiceUrl.Replace(".aspx", ""), "") : currentLink;
                                         if (!niceUrl.StartsWith("/"))
                                             niceUrl = "/" + niceUrl;
 
diff --git a/umbraco/presentation/web.config b/umbraco/presentation/web.config
index b805ee0b5c..ed274b95b8 100644
--- a/umbraco/presentation/web.config
+++ b/umbraco/presentation/web.config
@@ -39,8 +39,8 @@
   <Examine configSource="config\ExamineSettings.config" />
   <ExamineLuceneIndexSets configSource="config\ExamineIndex.config" />
   <appSettings>
-    <add key="umbracoDbDSN" value="server=.\sqlexpress;database=junoBeta;user id=DBUSER;password=DBPASSWORD" />
-    <add key="umbracoConfigurationStatus" value="" />
+    <add key="umbracoDbDSN" value="server=.\sqlexpress;database=v452;integrated security=false;user id=DBUSER;password=DBPASSWORD" />
+    <add key="umbracoConfigurationStatus" value="4.6.1" />
     <add key="umbracoReservedUrls" value="~/config/splashes/booting.aspx,~/install/default.aspx,~/config/splashes/noNodes.aspx,~/VSEnterpriseHelper.axd" />
     <add key="umbracoReservedPaths" value="~/umbraco,~/install/" />
     <add key="umbracoContentXML" value="~/App_Data/umbraco.config" />