tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/3.0' into 3.1

Browse Source 
Conflicts:
	.travis.yml
	forms/ConfirmedPasswordField.php
This commit is contained in:
Damian Mooyman 2014-05-06 10:06:58 +12:00
commit aef4b80fda
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
admin/code/LeftAndMain.php
View File

@ -715,9 +715,9 @@ class LeftAndMain extends Controller implements PermissionProvider {
$className = $this->stat('tree_class'); $className = $this->stat('tree_class');
if($className && $id instanceof $className) { if($className && $id instanceof $className) {
return $id; return $id;
} else if($id == 'root') { } else if($className && $id == 'root') {
return singleton($className); return singleton($className);
} else if(is_numeric($id)) { } else if($className && is_numeric($id)) {
return DataObject::get_by_id($className, $id); return DataObject::get_by_id($className, $id);
} else { } else {
return false; return false;