Merge branch 'MDL-84539-405' of https://github.com/andrewgos/moodle into MOODLE_405_STABLE

This commit is contained in:
Huong Nguyen
2025-04-28 08:59:40 +07:00
+3 -1
View File
@@ -260,6 +260,8 @@ if (!empty($instanceid) && !empty($roleid)) {
// Get record from sql_internal_table_reader and merge with records got from legacy log (if needed).
if (!$onlyuselegacyreader) {
$anonymoussql = !has_capability('moodle/site:viewanonymousevents', $context) ? 'AND l.anonymous = 0' : '';
$sql = "SELECT ra.userid, $usernamefields, u.idnumber, COUNT(DISTINCT l.timecreated) AS count
FROM {user} u
JOIN {role_assignments} ra ON u.id = ra.userid AND ra.contextid $relatedctxsql AND ra.roleid = :roleid
@@ -268,7 +270,7 @@ if (!empty($instanceid) && !empty($roleid)) {
ON l.contextinstanceid = :instanceid
AND l.timecreated > :timefrom" . $crudsql ."
AND l.edulevel = :edulevel
AND l.anonymous = 0
" . $anonymoussql . "
AND l.contextlevel = :contextlevel
AND (l.origin = 'web' OR l.origin = 'ws')
AND l.userid = ra.userid";