MDL-13810 Merged from 1.9

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