MDL-84085 mod_h5pactivity: account for missing ra table join alias.

paulholden · Jan 28, 2025 · 4170444 · 4170444
1 parent bcf06a0
commit 4170444
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/mod/h5pactivity/classes/local/manager.php b/mod/h5pactivity/classes/local/manager.php
@@ -357,7 +357,6 @@ public function get_active_users_join(bool $allpotentialusers = false, $currentg
 
         // We want to present all potential users.
         $capjoin = get_enrolled_with_capabilities_join($context, '', 'mod/h5pactivity:view', $currentgroup);
-
         if ($capjoin->cannotmatchanyrows) {
             return $capjoin;
         }
@@ -368,11 +367,13 @@ public function get_active_users_join(bool $allpotentialusers = false, $currentg
             return $capjoin;
         }
 
-        $capjoin = new sql_join(
-            $capjoin->joins . "\n LEFT " . str_replace('ra', 'reviewer', $reviewersjoin->joins),
-            $capjoin->wheres . " AND reviewer.userid IS NULL",
-            $capjoin->params
-        );
+        if (str_contains($reviewersjoin->joins, 'ra')) {
+            $capjoin = new sql_join(
+                $capjoin->joins . "\n LEFT " . str_replace('ra', 'reviewer', $reviewersjoin->joins),
+                $capjoin->wheres . " AND reviewer.userid IS NULL",
+                $capjoin->params
+            );
+        }
 
         if ($allpotentialusers) {
             return $capjoin;