Merge pull request kevinkhill#259 from NelsonBaez/patch-1

Fix "Is not a valid Timezone"
webboty · Aug 1, 2018 · 1e4d056 · 1e4d056
2 parents ca40b5d + 3821404
commit 1e4d056
Showing 1 changed file with 2 additions and 10 deletions.
diff --git a/src/DataTables/DataTable.php b/src/DataTables/DataTable.php
@@ -757,16 +757,8 @@ protected function isValidTimezone($tz) {
             return false;
         }
 
-        $timezoneList = call_user_func_array('array_merge', timezone_abbreviations_list());
-
-        $timezones = array_map(function ($timezone) {
-            if ($timezone['timezone_id'] != null) {
-                return strtolower($timezone['timezone_id']);
-            }
-        }, $timezoneList);
-
-        $timezones = array_filter($timezones, 'is_string');
-        $timezones = array_unique($timezones);
+        $timezones = timezone_identifiers_list();
+        $timezones = array_map('strtolower',$timezones);
 
         return in_array(strtolower($tz), $timezones, true);
     }