mirror of
https://github.com/silverstripe/silverstripe-cms
synced 2024-10-22 08:05:56 +02:00
MINOR Merge error
This commit is contained in:
parent
0194080951
commit
ee2c8003db
@ -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;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user