From f6021ae0afb133fb778a2819a732a25018b7ecbc Mon Sep 17 00:00:00 2001 From: Andrew Nicols Date: Thu, 10 May 2018 16:38:07 +0800 Subject: [PATCH] MDL-62384 mod_lesson: Move WHERE clause to JOIN --- mod/lesson/classes/privacy/provider.php | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/mod/lesson/classes/privacy/provider.php b/mod/lesson/classes/privacy/provider.php index a2b07060a63..afb6417f334 100644 --- a/mod/lesson/classes/privacy/provider.php +++ b/mod/lesson/classes/privacy/provider.php @@ -133,19 +133,24 @@ class provider implements AND ctx.contextlevel = :modulelevel LEFT JOIN {lesson_attempts} la ON la.lessonid = l.id + AND la.userid = :userid1 LEFT JOIN {lesson_branch} lb ON lb.lessonid = l.id + AND lb.userid = :userid2 LEFT JOIN {lesson_grades} lg ON lg.lessonid = l.id + AND lg.userid = :userid3 LEFT JOIN {lesson_overrides} lo ON lo.lessonid = l.id + AND lo.userid = :userid4 LEFT JOIN {lesson_timer} lt ON lt.lessonid = l.id - WHERE la.userid = :userid1 - OR lb.userid = :userid2 - OR lg.userid = :userid3 - OR lt.userid = :userid4 - OR lo.userid = :userid5"; + AND lt.userid = :userid5 + WHERE la.id IS NOT NULL + OR lb.id IS NOT NULL + OR lg.id IS NOT NULL + OR lo.id IS NOT NULL + OR lt.id IS NOT NULL"; $params = [ 'lesson' => 'lesson', -- 2.11.4.GIT