tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-09-28 20:29:15 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch '3.4' into 3

Browse Source
This commit is contained in:
Daniel Hensby 2016-09-16 11:56:01 +01:00
commit beeed8155a
No known key found for this signature in database
GPG Key ID: B00D1E9767F0B06E
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/javascript/LeftAndMain.js
View File

@ -1081,7 +1081,7 @@ jQuery.noConflict();
this._super();
},
onremove: function() {
if(this.data('button')) this.button('destroy');
if(!this.data('button')) this.button('destroy');
this._super();
}
});

3
security/Member.php
View File

@ -841,8 +841,9 @@ class Member extends DataObject implements TemplateGlobalProvider {
$id = Member::currentUserID();
if($id) {
return Member::get()->byId($id);
return DataObject::get_by_id('Member', $id);
}
return null;
}
/**