From: moodler Date: Fri, 15 Sep 2006 13:51:42 +0000 (+0000) Subject: Some SQL fixes X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=5081e7868d089592a01fcc1587c6a6e0c76192d3;p=moodle.git Some SQL fixes --- diff --git a/lib/accesslib.php b/lib/accesslib.php index 0986592dfa..95e37b00ca 100755 --- 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 2470df313c..ee0d6fd866 100644 --- 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 }