From: stronk7 <stronk7>
Date: Mon, 31 Dec 2007 15:25:27 +0000 (+0000)
Subject: Correct timezones listing when importing olson files ; merged from 19_STABLE
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=9156f58a1a4d1c9a05c026061b7a60e66a142a5f;p=moodle.git

Correct timezones listing when importing olson files ; merged from 19_STABLE
---

diff --git a/admin/timezoneimport.php b/admin/timezoneimport.php
index 8506ad2b7c..89a4459750 100644
--- a/admin/timezoneimport.php
+++ b/admin/timezoneimport.php
@@ -98,6 +98,9 @@
 
         $timezonelist = array();
         foreach ($timezones as $timezone) {
+            if (is_array($timezone)) {
+                $timezone = (object)$timezone;
+            }
             if (isset($timezonelist[$timezone->name])) {
                 $timezonelist[$timezone->name]++;
             } else {