From f66e44f26c8448fa67253b8091cdd30be48ae4a7 Mon Sep 17 00:00:00 2001 From: David Mudrak Date: Fri, 23 Apr 2010 00:11:54 +0000 Subject: [PATCH] MDL-15252 Fixed regression: timezone name string may not be defined --- lib/moodlelib.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/moodlelib.php b/lib/moodlelib.php index 999def3a0ef..fb9dfb8864f 100644 --- a/lib/moodlelib.php +++ b/lib/moodlelib.php @@ -6612,7 +6612,11 @@ function get_list_of_timezones() { if ($rawtimezones = $DB->get_records_sql("SELECT MAX(id), name FROM {timezone} GROUP BY name")) { foreach($rawtimezones as $timezone) { if (!empty($timezone->name)) { - $timezones[$timezone->name] = get_string(strtolower($timezone->name), 'timezones'); + if (get_string_manager()->string_exists(strtolower($timezone->name), 'timezones')) { + $timezones[$timezone->name] = get_string(strtolower($timezone->name), 'timezones'); + } else { + $timezones[$timezone->name] = $timezone->name; + } if (substr($timezones[$timezone->name], 0, 1) == '[') { // No translation found $timezones[$timezone->name] = $timezone->name; }