Commit bbb867ee authored by Robert Lyon's avatar Robert Lyon
Browse files

Bug 1929474: suspend_user() without suspendinguserid parameter 



Sets a generic message rather than assigning an admin to be the
suspender

Change-Id: I1dd7db7fec7921447938a27f169314dc49de298a
Signed-off-by: default avatarRobert Lyon <robertl@catalyst.net.nz>
parent da2bc9d4

htdocs/admin/users/edit.php

+3 −0
Original line number Diff line number Diff line
@@ -693,6 +693,9 @@ function edituser_site_submit(Pieform $form, $values) { 


// Suspension/deletion controls

$suspended = $user->get('suspendedcusr');

if (!empty($user->get('suspendedreason')) && $suspended == 0) {

    $suspended = true;

}

$expired = ($user->get('active') == 0 && $user->get('expirymailsent') && !$suspended);

if (empty($suspended)) {

    $suspendform = pieform(array(

htdocs/lib/user.php

+0 −4
Original line number Diff line number Diff line
@@ -1539,11 +1539,7 @@ function suspend_user($suspendeduserid, $reason, $suspendinguserid=null) { 


    $iscron = false;

    if ($suspendinguserid == 0) {

        // root user has ID = 0 -> happens when run in cron.

        // Use a valid site admin ID.

        $iscron = true;

        $admins = get_site_admins();

        $suspendinguserid = $admins[0]->id;

    }



    $suspendrec = new stdClass();