tonyair
/
silverstripe-blog
mirror of https://github.com/silverstripe/silverstripe-blog
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #111 from logicbrush/tagcloudfix 

Uncaught Exception: Object->__call(): the method 'data' does not exist on 'Security'
This commit is contained in:
Damian Mooyman 2014-03-22 23:49:11 +13:00
parent 1230276f6f 8073827328
commit 067003a6c3
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
code/BlogTree.php
View File

@ -50,21 +50,25 @@ class BlogTree extends Page {
*/
static function current($page = null) {
if (!$page) {
if (!$page && Controller::has_curr()) {
$controller = Controller::curr();
if($controller) $page = $controller->data();
if ($controller->hasMethod('data')) {
$page = $controller->data();
}
}
// If we _are_ a BlogTree, use us
if ($page instanceof BlogTree) return $page;
// If page is a virtual page use that
if($page instanceof VirtualPage && $page->CopyContentFrom() instanceof BlogTree) return $page;
// Or, if we a a BlogEntry underneath a BlogTree, use our parent
if($page->is_a("BlogEntry")) {
$parent = $page->getParent();
if($parent instanceof BlogTree) return $parent;
if ($page) {
// If we _are_ a BlogTree, use us
if ($page instanceof BlogTree) return $page;
// If page is a virtual page use that
if($page instanceof VirtualPage && $page->CopyContentFrom() instanceof BlogTree) return $page;
// Or, if we a a BlogEntry underneath a BlogTree, use our parent
if($page->is_a("BlogEntry")) {
$parent = $page->getParent();
if($parent instanceof BlogTree) return $parent;
}
}
// Try to find a top-level BlogTree