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

Workitem: 29976 - Additional fix, sometimes the niceUrl does NOT start with a slash, in which case you wouldn´t want to strip the first character

Browse Source
This commit is contained in:
sebastiaan
2011-01-31 15:02:24 -01:00
parent e07dfd49a1
commit d165b75456
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -37,7 +37,7 @@ namespace umbraco.cms.presentation
controls.ContentControl cControl;
DropDownList ddlDefaultTemplate = new DropDownList();
uicontrols.Pane publishProps = new uicontrols.Pane();
uicontrols.Pane linkProps = new uicontrols.Pane();
@@ -133,8 +133,8 @@ namespace umbraco.cms.presentation
cms.businesslogic.web.DocumentType DocumentType = new cms.businesslogic.web.DocumentType(_document.ContentType.Id);
cControl.PropertiesPane.addProperty(ui.Text("documentType"), new LiteralControl(DocumentType.Text));
//template picker
cControl.PropertiesPane.addProperty(ui.Text("template"), template);
@@ -281,7 +281,7 @@ namespace umbraco.cms.presentation
}
}
// Run Handler
@@ -316,7 +316,7 @@ namespace umbraco.cms.presentation
if (_document.PublishWithResult(base.getUser()))
{
ClientTools.ShowSpeechBubble(speechBubbleIcon.save, ui.Text("speechBubbles", "editContentPublishedHeader", null), ui.Text("speechBubbles", "editContentPublishedText", null));
library.UpdateDocumentCache(_document.Id);
@@ -383,7 +383,13 @@ namespace umbraco.cms.presentation
if (library.NiceUrl(int.Parse(s)) == "")
tempLink = "<em>N/A</em>";
else if (int.Parse(s) != _document.Id)
tempLink = "http://" + domains[i].Name + "/" + currentLink.Replace(library.NiceUrl(int.Parse(s)).Replace(".aspx", ""), "").Substring(1);
{
string niceUrl = currentLink.Replace(library.NiceUrl(int.Parse(s)).Replace(".aspx", ""), "");
if (!niceUrl.StartsWith("/"))
niceUrl = "/" + niceUrl;
tempLink = "http://" + domains[i].Name + niceUrl;
}
else
tempLink = "http://" + domains[i].Name;