tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-10-22 06:05:56 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch '3'

Browse Source
This commit is contained in:
Daniel Hensby 2017-01-17 12:33:26 +00:00
commit 3f53da050c
No known key found for this signature in database
GPG Key ID: B00D1E9767F0B06E
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
code/Model/SiteTree.php
View File

@ -2536,8 +2536,7 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
// Otherwise, the class and all its subclasses are allowed. // Otherwise, the class and all its subclasses are allowed.
if(substr($candidate,0,1) == '*') { if(substr($candidate,0,1) == '*') {
$allowedChildren[] = substr($candidate,1); $allowedChildren[] = substr($candidate,1);
} else { } elseif ($subclasses = ClassInfo::subclassesFor($candidate)) {
$subclasses = ClassInfo::subclassesFor($candidate);
foreach($subclasses as $subclass) { foreach($subclasses as $subclass) {
if ($subclass == 'SiteTree_root' || singleton($subclass) instanceof HiddenClass) { if ($subclass == 'SiteTree_root' || singleton($subclass) instanceof HiddenClass) {
continue; continue;