L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-34657_fixup' of git://github.com/timhunt/moodle

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7)
2012-10-04 23:42:47 +02:00
parent e12a3e64ac 965d167068
commit 7ba4b17f00
5 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/roles/lib.php
+4 -7
View File
@@ -1596,13 +1596,10 @@ class admins_existing_selector extends user_selector_base {
}
$mainadmin = array();
$adminids = explode(',', $CFG->siteadmins);
foreach ($adminids as $id) {
if (isset($availableusers[$id])) {
$mainadmin = array($id=>$availableusers[$id]);
unset($availableusers[$id]);
break;
}
$mainadminuser = get_admin();
if ($mainadminuser && isset($availableusers[$mainadminuser->id])) {
$mainadmin = array($mainadminuser->id => $availableusers[$mainadminuser->id]);
unset($availableusers[$mainadminuser->id]);
}
$result = array();
lib/datalib.php
+1 -1
View File
@@ -252,7 +252,7 @@ function users_order_by_sql($usertablealias = '', $search = null, context $conte
$fieldstocheck = array_merge(array('firstname', 'lastname'), get_extra_user_fields($context));
foreach ($fieldstocheck as $key => $field) {
$exactconditions[] = $tableprefix . $field . ' = :' . $paramkey;
$exactconditions[] = 'LOWER(' . $tableprefix . $field . ') = LOWER(:' . $paramkey . ')';
$params[$paramkey] = $search;
$paramkey++;
}
mod/workshop/locallib.php
+1 -1
View File
@@ -500,7 +500,7 @@ class workshop {
return array();
}
list($sort, $sortparams) = users_order_by_sql('u');
list($sort, $sortparams) = users_order_by_sql();
$sql .= " ORDER BY $sort";
return $DB->get_records_sql($sql, array_merge($params, $sortparams), $limitfrom, $limitnum);
report/stats/locallib.php
+1 -1
View File
@@ -111,7 +111,7 @@ function report_stats_report($course, $report, $mode, $user, $roleid, $time) {
list($sort, $moreparams) = users_order_by_sql('u');
$moreparams['courseid'] = $course->id;
$sql = "SELECT DISTINCT s.userid, u.firstname, u.lastname, u.idnumber
$sql = "SELECT DISTINCT u.id, u.firstname, u.lastname, u.idnumber
FROM {stats_user_{$param->table}} s
JOIN {user} u ON u.id = s.userid
WHERE courseid = :courseid";
user/selector/lib.php
+6 -1
View File
@@ -735,9 +735,14 @@ abstract class groups_user_selector_base extends user_selector_base {
class group_members_selector extends groups_user_selector_base {
public function find_users($search) {
list($wherecondition, $params) = $this->search_sql($search, 'u');
list($sort, $sortparams) = users_order_by_sql('u', $search, $this->accesscontext);
$orderby = ' ORDER BY ' . $sort;
$roles = groups_get_members_by_role($this->groupid, $this->courseid,
$this->required_fields_sql('u') . ', gm.component',
null, $wherecondition, $params);
$sort, $wherecondition, array_merge($params, $sortparams));
return $this->convert_array_format($roles, $search);
}
}