yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Work items: 29972

Browse Source
This commit is contained in:
hartvig
2011-02-22 11:21:22 -01:00
parent 526bc454a5
commit e2cee9e99d
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
umbraco/presentation/umbraco/editContent.aspx.cs
View File

@@ -382,7 +382,9 @@ namespace umbraco.cms.presentation
tempLink = "<em>N/A</em>"; tempLink = "<em>N/A</em>";
else if (int.Parse(s) != _document.Id) 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("/")) if (!niceUrl.StartsWith("/"))
niceUrl = "/" + niceUrl; niceUrl = "/" + niceUrl;

4
umbraco/presentation/web.config
View File

@@ -39,8 +39,8 @@
<Examine configSource="config\ExamineSettings.config" /> <Examine configSource="config\ExamineSettings.config" />
<ExamineLuceneIndexSets configSource="config\ExamineIndex.config" /> <ExamineLuceneIndexSets configSource="config\ExamineIndex.config" />
<appSettings> <appSettings>
<add key="umbracoDbDSN" value="server=.\sqlexpress;database=junoBeta;user id=DBUSER;password=DBPASSWORD" /> <add key="umbracoDbDSN" value="server=.\sqlexpress;database=v452;integrated security=false;user id=DBUSER;password=DBPASSWORD" />
<add key="umbracoConfigurationStatus" value="" /> <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="umbracoReservedUrls" value="~/config/splashes/booting.aspx,~/install/default.aspx,~/config/splashes/noNodes.aspx,~/VSEnterpriseHelper.axd" />
<add key="umbracoReservedPaths" value="~/umbraco,~/install/" /> <add key="umbracoReservedPaths" value="~/umbraco,~/install/" />
<add key="umbracoContentXML" value="~/App_Data/umbraco.config" /> <add key="umbracoContentXML" value="~/App_Data/umbraco.config" />