From: stronk7 Date: Tue, 5 Sep 2006 18:57:37 +0000 (+0000) Subject: Modified get_users_by_capability() call to use the new limit X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=270643ca7286cd8a3eef512d1f561622578d209a;p=moodle.git Modified get_users_by_capability() call to use the new limit parameters and cleanup a bit of code. --- diff --git a/admin/utfdbmigrate.php b/admin/utfdbmigrate.php index 3390e924f5..d2271f758d 100755 --- a/admin/utfdbmigrate.php +++ b/admin/utfdbmigrate.php @@ -970,8 +970,8 @@ function get_main_teacher_lang($courseid) { if (!empty($CFG->rolesactive)) { $context = get_context_instance(CONTEXT_COURSE, $courseid); - $teachers = get_users_by_capability($context, 'moodle/legacy:editingteacher', 'distinct u.*', ' ORDER BY ra.id ASC ', sql_paging_limit(0,1)); // only need first one - $teacher = array_shift($teachers); + $teachers = get_users_by_capability($context, 'moodle/legacy:editingteacher', 'u.id, u.lang', ' ORDER BY ra.id ASC ', 0, 1); // only need first one + $teacher = reset($teachers); $mainteachercache[$courseid] = $teacher->lang; return $teacher->lang; @@ -979,10 +979,14 @@ function get_main_teacher_lang($courseid) { /// this is a better guess } else { - $SQL = 'SELECT u.lang from '.$CFG->prefix.'user_teachers ut, - '.$CFG->prefix.'course c, - '.$CFG->prefix.'user u WHERE - c.id = ut.course AND ut.course = '.$courseid.' AND u.id = ut.userid ORDER BY ut.authority ASC'; + $SQL = 'SELECT u.id, u.lang + FROM '.$CFG->prefix.'user_teachers ut, + '.$CFG->prefix.'course c, + '.$CFG->prefix.'user u + WHERE c.id = ut.course AND + ut.course = '.$courseid.' AND + u.id = ut.userid + ORDER BY ut.authority ASC'; if ($teacher = get_record_sql($SQL, true)) { $mainteachercache[$courseid] = $teacher->lang;