Merged MDL-13810 Fixed check for ul.timeaccess

diff --git a/lib/accesslib.php b/lib/accesslib.php
index 8b290741b952f21a2a8e1929975527b8433d9f7c..04a4123599305563646e645cfb378c737d771afe 100755 (executable)
--- a/lib/accesslib.php
+++ b/lib/accesslib.php
@@ -4525,11 +4525,11 @@ function get_users_by_capability($context, $capability, $fields='', $sort='',
     $sortby = $sort ? " ORDER BY $sort " : '';
 
     // User lastaccess JOIN
-    if ($sort == 'ul.timeaccess') {
+    if (strpos($sort, 'ul.timeaccess') === FALSE) {  // user_lastaccess is not required MDL-13810
+        $uljoin = '';
+    } else {
         $uljoin = "LEFT OUTER JOIN {$CFG->prefix}user_lastaccess ul 
                          ON (ul.userid = u.id AND ul.courseid = {$context->instanceid})";
-    } else {
-        $uljoin = '';
     }
 
     //