From 8bb7147620c21f88573303b268558d1ce52e0359 Mon Sep 17 00:00:00 2001 From: stronk7 Date: Thu, 7 Sep 2006 17:25:06 +0000 Subject: [PATCH] If one course, hasn't teaches, both under roles and no-roles installations, default to admin language. --- admin/utfdbmigrate.php | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/admin/utfdbmigrate.php b/admin/utfdbmigrate.php index d2271f758d..3eff4deb9b 100755 --- a/admin/utfdbmigrate.php +++ b/admin/utfdbmigrate.php @@ -971,11 +971,11 @@ function get_main_teacher_lang($courseid) { $context = get_context_instance(CONTEXT_COURSE, $courseid); $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; - + if (is_array($teachers)) { + $teacher = reset($teachers); + $mainteachercache[$courseid] = $teacher->lang; + return $teacher->lang; + } /// this is a better guess } else { @@ -991,12 +991,13 @@ function get_main_teacher_lang($courseid) { if ($teacher = get_record_sql($SQL, true)) { $mainteachercache[$courseid] = $teacher->lang; return $teacher->lang; - } else { - $admin = get_admin(); - $mainteachercache[$courseid] = $admin->lang; - return $admin->lang; } } + /// Arriving here we haven't been able to select any teacher lang + /// so use the admin lang + $admin = get_admin(); + $mainteachercache[$courseid] = $admin->lang; + return $admin->lang; } else { return $mainteachercache[$courseid]; } -- 2.39.5