Merge branch 'MDL-47689-master' of git://github.com/gurgus/moodle
This commit is contained in:
+3
-3
@@ -410,9 +410,9 @@ list($esql, $params) = get_enrolled_sql($context, null, $currentgroup, true);
|
||||
$joins = array("FROM {user} u");
|
||||
$wheres = array();
|
||||
|
||||
$mainuserfields = user_picture::fields('u', array('username', 'email', 'city', 'country', 'lang', 'timezone', 'maildisplay'));
|
||||
$alreadyretrievedfields = explode(',', $mainuserfields);
|
||||
$extrasql = get_extra_user_fields_sql($context, 'u', '', $alreadyretrievedfields);
|
||||
$userfields = array('username', 'email', 'city', 'country', 'lang', 'timezone', 'maildisplay');
|
||||
$mainuserfields = user_picture::fields('u', $userfields);
|
||||
$extrasql = get_extra_user_fields_sql($context, 'u', '', $userfields);
|
||||
|
||||
if ($isfrontpage) {
|
||||
$select = "SELECT $mainuserfields, u.lastaccess$extrasql";
|
||||
|
||||
Reference in New Issue
Block a user