tonyair/silverstripe-blog
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-blog synced 2024-10-22 11:05:58 +02:00
Code Issues Projects Releases Wiki Activity

5759: BlogTree::current() returning null when blogTree exists

Browse Source 
modified:   code/BlogTree.php
This commit is contained in:
Matt Clegg 2011-01-20 09:08:10 +00:00
parent e2f088e1e8
commit fb16abc1c6
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
code/BlogTree.php
View File

@ -44,7 +44,10 @@ class BlogTree extends Page {
if (!$page) { if (!$page) {
$controller = Controller::curr(); $controller = Controller::curr();
if($controller) $page = $controller->data(); if($controller) {
if (!isset($controller->data)) return false;
$page = $controller->data();
}
} }
// If we _are_ a BlogTree, use us // If we _are_ a BlogTree, use us
@ -61,13 +64,14 @@ class BlogTree extends Page {
if($top) return $top; if($top) return $top;
// Try to find any BlogTree that is not inside another BlogTree // Try to find any BlogTree that is not inside another BlogTree
foreach(DataObject::get('BlogTree') as $tree) { if($blogTrees=DataObject::get('BlogTree')) foreach($blogTrees as $tree) {
if(!($tree->getParent() instanceof BlogTree)) return $tree; if(!($tree->getParent() instanceof BlogTree)) return $tree;
} }
// This shouldn't be possible, but assuming the above fails, just return anything you can get // This shouldn't be possible, but assuming the above fails, just return anything you can get
return DataObject::get_one('BlogTree'); return $blogTrees;
} }
/* ----------- ACCESSOR OVERRIDES -------------- */ /* ----------- ACCESSOR OVERRIDES -------------- */
@ -122,16 +126,14 @@ class BlogTree extends Page {
/* ----------- New accessors -------------- */ /* ----------- New accessors -------------- */
public function loadDescendantBlogHolderIDListInto(&$idList) { public function loadDescendantBlogHolderIDListInto(&$idList) {
if ($children = $this->AllChildren()) { if ($children = $this->AllChildren()) foreach($children as $child) {
foreach($children as $child) { if(in_array($child->ID, $idList)) continue;
if(in_array($child->ID, $idList)) continue;
if($child instanceof BlogHolder) {
if($child instanceof BlogHolder) { $idList[] = $child->ID;
$idList[] = $child->ID; } elseif($child instanceof BlogTree) {
} elseif($child instanceof BlogTree) { $child->loadDescendantBlogHolderIDListInto($idList);
$child->loadDescendantBlogHolderIDListInto($idList); }
}
}
} }
} }
@ -317,8 +319,7 @@ class BlogTree_Controller extends Page_Controller {
return $date; return $date;
} else { } else {
if(is_numeric($year)) return $year;
if(is_numeric($year)) return $year;
} }
} }