tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 12:05:37 +00:00
Code Issues Projects Releases Wiki Activity

bfojcapell: These changes are required to Translatable versioning support correctly work. Versioned automatically adds this suffix so there is no need to add it here

Browse Source 
(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42122 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Ingo Schommer 2007-09-16 16:20:07 +00:00
parent b90ca2e60f
commit 06909765d6
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/model/Hierarchy.php
View File

@ -413,7 +413,7 @@ class Hierarchy extends DataObjectDecorator {
}
if(isset($idxStageChildren)) {
$foundInLive = Versioned::get_by_stage( $baseClass, 'Live', "`{$baseClass}_Live`.`ID` IN (" . implode(",", array_keys($idxStageChildren)) . ")", "" );
$foundInLive = Versioned::get_by_stage( $baseClass, 'Live', "`{$baseClass}`.`ID` IN (" . implode(",", array_keys($idxStageChildren)) . ")", "" );
}
if(isset($idxLiveChildren)) {
@ -503,7 +503,7 @@ class Hierarchy extends DataObjectDecorator {
public function liveChildren($showAll = false) {
$extraFilter = $showAll ? '' : " AND ShowInMenus = 1";
$baseClass = ClassInfo::baseDataClass($this->owner->class);
return Versioned::get_by_stage($baseClass, "Live", "`{$baseClass}_Live`.`ParentID` = " . (int)$this->owner->ID . " AND `{$baseClass}_Live`.ID != " . (int)$this->owner->ID. $extraFilter, "");
return Versioned::get_by_stage($baseClass, "Live", "`{$baseClass}`.`ParentID` = " . (int)$this->owner->ID . " AND `{$baseClass}`.ID != " . (int)$this->owner->ID. $extraFilter, "");
}
/**