Commit 6f54f33a authored by Patrick Schmalstig's avatar Patrick Schmalstig
Browse files

Fixed MANTIS-6226 (Unable to log out when rules, password change, or parental controls enforced)

parent 2b410cd1
Loading
Loading
Loading
Loading
+15 −0
Original line number Diff line number Diff line
@@ -364,6 +364,11 @@ function enforce_temporary_passwords(int $member_id)
        return;
    }

    // Allow logging out
    if ((get_page_name() == 'login') && (get_param_string('type', 'browse') == 'logout')) {
        return;
    }

    require_code('users_active_actions');
    _enforce_temporary_passwords($member_id);
}
@@ -405,6 +410,11 @@ function enforce_declarations(int $member_id)
        return;
    }

    // Allow logging out
    if ((get_page_name() == 'login') && (get_param_string('type', 'browse') == 'logout')) {
        return;
    }

    // No need to enforce declarations if there aren't any configured
    if (trim(preg_replace('#\n+#', "\n", get_option('join_declarations'))) == '') {
        return;
@@ -446,6 +456,11 @@ function enforce_parental_controls(int $member_id)
        return;
    }

    // Allow logging out
    if ((get_page_name() == 'login') && (get_param_string('type', 'browse') == 'logout')) {
        return;
    }

    // Load in parental controls and member data for checking
    require_code('cns_parental_controls');
    require_code('locations');