Merge branch 'wip-MDL-61814-33-fix' of git://github.com/abgreeve/mood…

…le into MOODLE_33_STABLE
moodle · May 11, 2018 · c0e4458 · c0e4458
2 parents 83038cd + f3bd9db
commit c0e4458
Showing 1 changed file with 17 additions and 6 deletions.
diff --git a/report/stats/classes/privacy/provider.php b/report/stats/classes/privacy/provider.php
@@ -87,16 +87,27 @@ public static function get_metadata(collection $collection) {
      * @return  contextlist $contextlist The contextlist containing the list of contexts used in this plugin.
      */
     public static function get_contexts_for_userid($userid) {
-        $params = ['dailyuser' => $userid, 'weeklyuser' => $userid, 'monthlyuser' => $userid, 'contextcourse' => CONTEXT_COURSE];
+        $params = ['userid' => $userid, 'contextcourse' => CONTEXT_COURSE];
         $sql = "SELECT ctx.id
                 FROM {context} ctx
-                LEFT JOIN {stats_user_daily} sud ON sud.courseid = ctx.instanceid
-                LEFT JOIN {stats_user_weekly} suw ON suw.courseid = ctx.instanceid
-                LEFT JOIN {stats_user_monthly} sum ON sum.courseid = ctx.instanceid
-                WHERE ctx.contextlevel = :contextcourse
-                AND (sud.userid = :dailyuser OR suw.userid = :weeklyuser OR sum.userid = :monthlyuser)";
+                JOIN {stats_user_daily} sud ON sud.courseid = ctx.instanceid AND sud.userid = :userid
+                WHERE ctx.contextlevel = :contextcourse";
+
         $contextlist = new contextlist();
         $contextlist->add_from_sql($sql, $params);
+
+        $sql = "SELECT ctx.id
+                FROM {context} ctx
+                JOIN {stats_user_weekly} suw ON suw.courseid = ctx.instanceid AND suw.userid = :userid
+                WHERE ctx.contextlevel = :contextcourse";
+        $contextlist->add_from_sql($sql, $params);
+
+        $sql = "SELECT ctx.id
+                FROM {context} ctx
+                JOIN {stats_user_monthly} sum ON sum.courseid = ctx.instanceid AND sum.userid = :userid
+                WHERE ctx.contextlevel = :contextcourse";
+        $contextlist->add_from_sql($sql, $params);
+
         return $contextlist;
     }