accesslib: get_user_courses_bycap() - make $doanything work in the optimised path

OMG! Bugfix!

diff --git a/lib/accesslib.php b/lib/accesslib.php
index 88e6d163ceaa655a48de069852937c8cd4ed2a11..e1f884989ea6a9cd3d59e734d917dcc0108e40c4 100755 (executable)
--- a/lib/accesslib.php
+++ b/lib/accesslib.php
@@ -746,6 +746,11 @@ function get_user_courses_bycap($userid, $cap, $sess, $doanything, $sort='c.sort
             $catclause = 'OR (' . join(' OR ', $catpaths) .')';
         }
         unset($catpaths);
+
+        $capany = '';
+        if ($doanything) {
+            $capany = " OR rc.capability='moodle/site:doanything'";
+        }
         //
         // Note here that we *have* to have the compound clauses
         // in the LEFT OUTER JOIN condition for them to return NULL
@@ -759,7 +764,7 @@ function get_user_courses_bycap($userid, $cap, $sess, $doanything, $sort='c.sort
                 LEFT OUTER JOIN {$CFG->prefix}role_assignments ra
                   ON (ra.contextid=ctx.id AND ra.userid=$userid)
                 LEFT OUTER JOIN {$CFG->prefix}role_capabilities rc
-                  ON (rc.contextid=ctx.id AND rc.capability='$cap')
+                  ON (rc.contextid=ctx.id AND (rc.capability='$cap' $capany))
                 WHERE    ra.id IS NOT NULL
                       OR rc.id IS NOT NULL
                       $catclause