From ad497eea7be3ca752dfb60e1c4cac9cac7608d26 Mon Sep 17 00:00:00 2001 From: skodak Date: Sat, 22 Apr 2006 15:51:00 +0000 Subject: [PATCH] fixed undefined pg encoding in warning and undefined main teacher lang when no teacher in course --- admin/utfdbmigrate.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/admin/utfdbmigrate.php b/admin/utfdbmigrate.php index f96708b147..e91cb76d11 100755 --- a/admin/utfdbmigrate.php +++ b/admin/utfdbmigrate.php @@ -772,6 +772,10 @@ 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; } } else { return $mainteachercache[$courseid]; @@ -857,6 +861,7 @@ function validate_form(&$form, &$err) { } if (!is_postgres_utf8($newdb)) { + $encoding = $newdb->GetOne('SHOW server_encoding'); $err['dbconnect'] = get_string('dbmigrateencodingerror', 'admin', $encoding); return; } -- 2.39.5