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

diff --git a/admin/timezoneimport.php b/admin/timezoneimport.php
index 8506ad2b7ce3bdfe21721ce472340ab5429553f2..89a4459750cf8e4b39124db708f082a40e4cc786 100644 (file)
--- 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 {