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

ENHANCEMENT Allowing usage of $member parameter for Member::check() as ID, Code or Object

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@62844 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Ingo Schommer 2008-09-22 16:04:22 +00:00
parent 306ea3761f
commit 764ab2b1a2
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
security/Permission.php
View File

@ -85,7 +85,7 @@ class Permission extends DataObject {
* @param string $code Code of the permission to check
* @param string $arg Optional argument (e.g. a permissions for a specific
* page)
* @param int $memberID Optional member ID. If set to NULL, the permssion
* @param int|Member $member Optional member instance or ID. If set to NULL, the permssion
* will be checked for the current user
* @param bool $strict Use "strict" checking (which means a permission
* will be granted if the key does not exist at all)?
@ -94,15 +94,15 @@ class Permission extends DataObject {
* disabled, TRUE will be returned if the permission does
* not exist at all.
*/
public static function check($code, $arg = "any", $memberID = null, $strict = true) {
if(!$memberID) {
public static function check($code, $arg = "any", $member = null, $strict = true) {
if(!$member) {
if(!Member::currentUser()) {
return false;
}
$memberID = Member::currentUserID();
$member = Member::currentUser();
}
return self::checkMember($memberID, $code, $arg, $strict);
return self::checkMember($member, $code, $arg, $strict);
}