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

Merge

Browse Source
This commit is contained in:
Sebastiaan Janssen
2012-12-12 07:21:17 -01:00
parent 094fbf2e6b 7aa2064322
commit 5f93e20fab
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Web/DefaultPublishedContentStore.cs
View File

@@ -42,7 +42,7 @@ namespace Umbraco.Web
DescendantDocumentById = "//node [@id={0}]";
DescendantDocumentByAlias = "//node[("
+ "contains(concat(',',translate(data [@alias='umbracoUrlAlias'], ' ', ''),','),',{0},')"
+ " or contains(concat(',',translate(data [@alias='umbracoUrlAlias'], ' ', ''),','),',/{0},'"
+ " or contains(concat(',',translate(data [@alias='umbracoUrlAlias'], ' ', ''),','),',/{0},')"
+ ")]";
ChildDocumentByUrlName = "/node [@urlName='{0}']";
RootDocumentWithLowestSortOrder = "/root/node [not(@sortOrder > ../node/@sortOrder)][1]";

2
src/umbraco.cms/businesslogic/web/Document.cs
View File

@@ -781,7 +781,7 @@ namespace umbraco.cms.businesslogic.web
int x = SqlHelper.ExecuteScalar<int>(@"select count(node.id) - count(doc.nodeid)
from umbracoNode as node
left join cmsDocument as doc on (node.id=doc.nodeId and doc.published=1)
where '" + Path + ",' like " + SqlHelper.Concat("node.path", "'%'"));
where '" + Path + ",' like " + SqlHelper.Concat("node.path", "',%'"));
return (x == 1);
}
}