MINOR Merge error

This commit is contained in:
Ingo Schommer 2011-12-29 09:53:18 +01:00
parent 0194080951
commit ee2c8003db

View File

@ -252,7 +252,6 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
$defaultParent = $obj->defaultParent(); $defaultParent = $obj->defaultParent();
$id = $defaultParent ? SiteTree::get_by_link($defaultParent)->ID : null; $id = $defaultParent ? SiteTree::get_by_link($defaultParent)->ID : null;
$defaultParent = $id ? SiteTree::get_by_link($obj->defaultParent())->ID : null;
if ($defaultParent != 1 && $defaultParent != null) $def[$class]['defaultParent'] = $defaultParent; if ($defaultParent != 1 && $defaultParent != null) $def[$class]['defaultParent'] = $defaultParent;