Some SQL fixes

diff --git a/lib/accesslib.php b/lib/accesslib.php
index 0986592dfa1c2a18f23c005734712091dd8ab002..95e37b00cab575d80fa32a1fe3df48c54de93318 100755 (executable)
--- a/lib/accesslib.php
+++ b/lib/accesslib.php
@@ -2310,16 +2310,14 @@ function get_users_by_capability($context, $capability, $fields='u.*, ul.timeacc
     }
     
     /// sorting out exceptions
-    if ($exceptions) {
-        $exceptionsql = "AND u.id NOT IN ($exceptions)";
-    } else {
-        $exceptionsql = '';
-    }
+    $exceptionsql = $exceptions ? "AND u.id NOT IN ($exceptions)" : '';
     
     /// if context is a course, then construct sql for ul
     if ($context->aggregatelevel == CONTEXT_COURSE) {
         $courseid = $context->instanceid;
         $coursesql = "AND (ul.courseid = $courseid OR ISNULL(ul.courseid))";
+    } else {
+        $coursesql = '';
     }
     
     /// sorting out roles with this capability set
@@ -2334,11 +2332,7 @@ function get_users_by_capability($context, $capability, $fields='u.*, ul.timeacc
     $roleids =  '('.implode(',', $validroleids).')';
     
     /// sorting out the sort order
-    if ($sort) {
-        $sortby = " ORDER BY $sort ";  
-    } else {
-        $sortby = "";  
-    }
+    $sortby = $sort ? " ORDER BY $sort " : '';  
     
     /// Construct the main SQL
     $select = " SELECT $fields";

diff --git a/lib/datalib.php b/lib/datalib.php
index 2470df313c4ca224d7e7ef5300ba3044fe2a8eed..ee0d6fd866e3857d29be140606d4273455b0c07f 100644 (file)
--- a/lib/datalib.php
+++ b/lib/datalib.php
@@ -65,7 +65,7 @@ function get_admins() {
     
     $context = get_context_instance(CONTEXT_SYSTEM, SITEID);
 
-    return get_users_by_capability($context, 'moodle/legacy:admin', 'u.*, ra.id as adminid', ' ORDER BY ra.id ASC '); // only need first one
+    return get_users_by_capability($context, 'moodle/legacy:admin', 'u.*, ra.id as adminid', 'ra.id ASC'); // only need first one
                              
 }