Version 4.7.23
This commit is contained in:
1 parent
7124a02564
commit
25ddeb65d6
1791 files changed
+76990
-44452
No files matched your search
@@ -1086,7 +1086,7 @@ class _members extends \IPS\Api\Controller
|
||||
}
|
||||
else
|
||||
{
|
||||
$member->$v = $this->$k;
|
||||
$member->$v = $warning->$k;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1282,6 +1282,11 @@ class _members extends \IPS\Api\Controller
|
||||
|
||||
$member->mgroup_others = implode( ',', $newSecondaryGroups );
|
||||
$member->save();
|
||||
$newSecondaryGroups = array_unique( array_filter( explode( ',', $member->mgroup_others ) ) );
|
||||
if ( array_diff( $mgroup_others, $newSecondaryGroups ) or array_diff( $newSecondaryGroups, $mgroup_others ) )
|
||||
{
|
||||
$member->logHistory( 'core', 'group', array( 'type' => 'secondary', 'by' => 'api', 'old' => $mgroup_others, 'new' => $newSecondaryGroups ), $this->member ?: FALSE );
|
||||
}
|
||||
|
||||
return new \IPS\Api\Response( 201, $member->apiOutput( $this->member ) );
|
||||
}
|
||||
@@ -1316,7 +1321,10 @@ class _members extends \IPS\Api\Controller
|
||||
|
||||
$secondaryGroups = array_filter( explode( ',', $member->mgroup_others ) );
|
||||
$key = array_search( $group->g_id, $secondaryGroups );
|
||||
unset( $secondaryGroups[ $key ] );
|
||||
if( $key !== FALSE )
|
||||
{
|
||||
unset( $secondaryGroups[ $key ] );
|
||||
}
|
||||
|
||||
$member->mgroup_others = implode( ',', array_unique( $secondaryGroups ) );
|
||||
$member->save();
|
||||
|
||||
Reference in new issue
Block a user