tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-07-02 17:39:30 +02:00
Code Issues Projects Releases Wiki Activity

MINOR initializing local variables properly in Hierarchy

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@70304 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Ingo Schommer 2009-01-16 04:04:13 +00:00
parent d5339af47c
commit c67ef43f6c
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/model/Hierarchy.php
View File

@ -387,9 +387,11 @@ class Hierarchy extends DataObjectDecorator {
* @return DataObjectSet * @return DataObjectSet
*/ */
public function doAllChildrenIncludingDeleted($context = null) { public function doAllChildrenIncludingDeleted($context = null) {
$idxStageChildren = array();
$idxLiveChildren = array();
// Cache the allChildren data, so that future requests will return the references to the same // Cache the allChildren data, so that future requests will return the references to the same
// object. This allows the mark..() system to work appropriately. // object. This allows the mark..() system to work appropriately.
if(!$this->_cache_allChildrenIncludingDeleted) { if(!$this->_cache_allChildrenIncludingDeleted) {
$baseClass = ClassInfo::baseDataClass($this->owner->class); $baseClass = ClassInfo::baseDataClass($this->owner->class);
if($baseClass) { if($baseClass) {
@ -416,11 +418,11 @@ class Hierarchy extends DataObjectDecorator {
} }
DataObject::disable_subclass_access(); DataObject::disable_subclass_access();
if(isset($idxStageChildren)) { if($idxStageChildren) {
$foundInLive = Versioned::get_by_stage( $baseClass, 'Live', "\"{$baseClass}\".\"ID\" IN (" . implode(",", array_keys($idxStageChildren)) . ")", "" ); $foundInLive = Versioned::get_by_stage( $baseClass, 'Live', "\"{$baseClass}\".\"ID\" IN (" . implode(",", array_keys($idxStageChildren)) . ")", "" );
} }
if(isset($idxLiveChildren)) { if($idxLiveChildren) {
$foundInStage = Versioned::get_by_stage( $baseClass, 'Stage', "\"{$baseClass}\".\"ID\" IN (" . implode(",", array_keys($idxLiveChildren)) . ")", "" ); $foundInStage = Versioned::get_by_stage( $baseClass, 'Stage', "\"{$baseClass}\".\"ID\" IN (" . implode(",", array_keys($idxLiveChildren)) . ")", "" );
} }
DataObject::enable_subclass_access(); DataObject::enable_subclass_access();