Version 5.0.6
This commit is contained in:
1 parent
a3a4a9ccbd
commit
b89858b2ff
1214 files changed
+92828
-14859
No files matched your search
@@ -1121,7 +1121,7 @@ class Member extends ActiveRecord
|
||||
|
||||
if( $this->_data['mgroup_others'] )
|
||||
{
|
||||
foreach( explode( ',', $this->_data['mgroup_others'] ) as $id )
|
||||
foreach( array_filter( explode( ',', $this->_data['mgroup_others'] ) ) as $id )
|
||||
{
|
||||
$this->_groups[] = intval( $id );
|
||||
}
|
||||
@@ -3514,14 +3514,14 @@ class Member extends ActiveRecord
|
||||
"(assign_type=? and assign_to=?)"
|
||||
];
|
||||
$binds = [
|
||||
Assignment::ASSIGNMENT_TEAM,
|
||||
Assignment::ASSIGNMENT_MEMBER,
|
||||
$this->member_id
|
||||
];
|
||||
|
||||
if( $teams = $this->teams() )
|
||||
{
|
||||
$clause[] = "(assign_type=? and " . Db::i()->in( 'assign_to', array_keys( $teams ) ) . ")";
|
||||
$binds[] = Assignment::ASSIGNMENT_MEMBER;
|
||||
$binds[] = Assignment::ASSIGNMENT_TEAM;
|
||||
}
|
||||
|
||||
$where = array_merge( array( implode( " OR ", $clause ) ), $binds );
|
||||
@@ -4123,7 +4123,7 @@ class Member extends ActiveRecord
|
||||
}
|
||||
|
||||
/* Otherwise return it */
|
||||
return $permissions[$key] ?? NULL;
|
||||
return $permissions[$key] ?? false;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -5077,9 +5077,9 @@ class Member extends ActiveRecord
|
||||
|
||||
/* Send referral notification */
|
||||
$this->_sendReferralNotification();
|
||||
|
||||
|
||||
/* Send an admin notification */
|
||||
AdminNotification::send( 'core', 'NewRegComplete', NULL, TRUE, $this, !$initiatedByAdmin );
|
||||
AdminNotification::send( 'core', 'NewRegComplete', NULL, TRUE, $this, $initiatedByAdmin );
|
||||
|
||||
/* Delete rows */
|
||||
Db::i()->delete( 'core_validating', array( 'member_id=?', $this->member_id ) );
|
||||
|
||||
Reference in new issue
Block a user