MDL-47481 Availability: Profile condition error if no users
This commit is contained in:
@@ -176,6 +176,12 @@ class condition extends \core_availability\condition {
|
||||
public function filter_user_list(array $users, $not, \core_availability\info $info,
|
||||
\core_availability\capability_checker $checker) {
|
||||
global $CFG, $DB;
|
||||
|
||||
// If the array is empty already, just return it.
|
||||
if (!$users) {
|
||||
return $users;
|
||||
}
|
||||
|
||||
require_once($CFG->libdir . '/grouplib.php');
|
||||
$course = $info->get_course();
|
||||
|
||||
|
||||
@@ -209,6 +209,11 @@ class condition extends \core_availability\condition {
|
||||
\core_availability\capability_checker $checker) {
|
||||
global $CFG, $DB;
|
||||
|
||||
// If the array is empty already, just return it.
|
||||
if (!$users) {
|
||||
return $users;
|
||||
}
|
||||
|
||||
// List users for this course who match the condition.
|
||||
$groupingusers = $DB->get_records_sql("
|
||||
SELECT DISTINCT gm.userid
|
||||
|
||||
@@ -416,6 +416,11 @@ class condition extends \core_availability\condition {
|
||||
\core_availability\capability_checker $checker) {
|
||||
global $CFG, $DB;
|
||||
|
||||
// If the array is empty already, just return it.
|
||||
if (!$users) {
|
||||
return $users;
|
||||
}
|
||||
|
||||
// Get all users from the list who match the condition.
|
||||
list ($sql, $params) = $DB->get_in_or_equal(array_keys($users));
|
||||
|
||||
|
||||
Reference in New Issue
Block a user