From 85db09fb811a212e141d214ace048d927f311fe1 Mon Sep 17 00:00:00 2001 From: skodak Date: Sat, 22 Mar 2008 20:23:06 +0000 Subject: [PATCH] MDL-14021 replaced sloppy JOIN ON TRUE with CROSS JOINs - ora or ms does not like it; backported from MOODLE_19_STABLE --- grade/report/grader/lib.php | 4 ++-- lib/statslib.php | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/grade/report/grader/lib.php b/grade/report/grader/lib.php index 799d12d47b..230c94dc0c 100644 --- a/grade/report/grader/lib.php +++ b/grade/report/grader/lib.php @@ -749,7 +749,7 @@ class grade_report_grader extends grade_report { if ($grade->is_overridden()) { $cellclasses .= ' overridden'; } - + if ($grade->is_excluded()) { $cellclasses .= ' excluded'; } @@ -967,7 +967,7 @@ class grade_report_grader extends grade_report { // This query returns a count of ungraded grades (NULL finalgrade OR no matching record in grade_grades table) $SQL = "SELECT gi.id, COUNT(u.id) AS count FROM {$CFG->prefix}grade_items gi - JOIN {$CFG->prefix}user u ON TRUE + CROSS JOIN {$CFG->prefix}user u JOIN {$CFG->prefix}role_assignments ra ON ra.userid = u.id LEFT OUTER JOIN {$CFG->prefix}grade_grades g ON (g.itemid = gi.id AND g.userid = u.id AND g.finalgrade IS NOT NULL) $groupsql diff --git a/lib/statslib.php b/lib/statslib.php index c002eb7d67..1b10e5c05c 100644 --- a/lib/statslib.php +++ b/lib/statslib.php @@ -779,8 +779,7 @@ function stats_get_enrolled_sql($limit, $includedoanything) { $join = "JOIN {$CFG->prefix}context ctx ON ctx.id = ra.contextid - JOIN {$CFG->prefix}course c - ON TRUE + CROSS JOIN {$CFG->prefix}course c JOIN {$CFG->prefix}role_capabilities rc ON rc.roleid = ra.roleid"; $where = "((rc.capability = 'moodle/course:view' $adm) -- 2.39.5