mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 14:05:37 +02:00
Merge remote-tracking branch 'origin/3.0' into 3.1
Conflicts: .travis.yml forms/ConfirmedPasswordField.php
This commit is contained in:
commit
aef4b80fda
@ -715,9 +715,9 @@ class LeftAndMain extends Controller implements PermissionProvider {
|
||||
$className = $this->stat('tree_class');
|
||||
if($className && $id instanceof $className) {
|
||||
return $id;
|
||||
} else if($id == 'root') {
|
||||
} else if($className && $id == 'root') {
|
||||
return singleton($className);
|
||||
} else if(is_numeric($id)) {
|
||||
} else if($className && is_numeric($id)) {
|
||||
return DataObject::get_by_id($className, $id);
|
||||
} else {
|
||||
return false;
|
||||
|
Loading…
Reference in New Issue
Block a user