Changeset 10756

Timestamp:

03/10/2009 03:26:52 PM (16 years ago)

Author:

ryan

Message:

Filter continents in the first loop. see #3962

File:

• trunk/wp-includes/functions.php (modified) (3 diffs)

trunk/wp-includes/functions.php

@@ -3095 +3095 @@
  */
 function wp_timezone_choice($selectedzone) {
+    $continents = array('Africa', 'America', 'Antarctica', 'Arctic', 'Asia', 'Atlantic', 'Australia', 'Europe', 'Indian', 'Pacific', 'Etc');
+
     $all = timezone_identifiers_list();
 
@@ -3100 +3102 @@
     foreach ( $all as $zone ) {
         $zone = explode('/',$zone);
+        if ( ! in_array($zone[0], $continents) )
+            continue;
         $zonen[$i]['continent'] = isset($zone[0]) ? $zone[0] : '';
         $zonen[$i]['city'] = isset($zone[1]) ? $zone[1] : '';
@@ -3110 +3114 @@
     $pad = '   ';
 
-    $continents = array('Africa', 'America', 'Antarctica', 'Arctic', 'Asia', 'Atlantic', 'Australia', 'Europe', 'Indian', 'Pacific', 'Etc');
-
     if ( empty($selectedzone) )
         $structure .= '<option selected="selected" value="">' . __('Select a city') . "</option>\n";
     foreach ( $zonen as $zone ) {
         extract($zone);
-        if ( ! in_array($continent, $continents) )
-            continue;
         if ( empty($selectcontinent) && !empty($city) ) {
             $selectcontinent = $continent;