Ticket #10292: 10292.patch

wp-includes/functions.php

@@ -3222 +3222 @@
 /**
  * Gives a nicely formatted list of timezone strings // temporary! Not in final
  *
- * @param string $selectedzone - which zone should be the selected one
+ * @param $selected_zone string Selected Zone
  *
  */
 function wp_timezone_choice( $selected_zone ) {
@@ -3238 +3238 @@
                 $mo_loaded = true;
         }
 
-        $zonen = array();
+        $zones = array();
         foreach ( timezone_identifiers_list() as $zone ) {
                 $zone = explode( '/', $zone );
                 if ( !in_array( $zone[0], $continents ) ) {
@@ -3258 +3258 @@
                 $exists[4] = ( $exists[1] && $exists[3] ) ? true : false;
                 $exists[5] = ( $exists[2] && $exists[3] ) ? true : false;
 
-                $zonen[] = array(
+                $zones[] = array(
                         'continent'   => ( $exists[0] ? $zone[0] : '' ),
                         'city'        => ( $exists[1] ? $zone[1] : '' ),
                         'subcity'     => ( $exists[2] ? $zone[2] : '' ),
@@ -3267 +3267 @@
                         't_subcity'   => ( $exists[5] ? translate( str_replace( '_', ' ', $zone[2] ), 'continents-cities' ) : '' )
                 );
         }
-        usort( $zonen, '_wp_timezone_choice_usort_callback' );
+        usort( $zones, '_wp_timezone_choice_usort_callback' ); 
 
         $structure = array();
 
@@ -3275 +3275 @@
                 $structure[] = '<option selected="selected" value="">' . __( 'Select a city' ) . '</option>';
         }
 
-        foreach ( $zonen as $key => $zone ) {
+        foreach ( $zones as $key => $zone ) {
                 // Build value in an array to join later
                 $value = array( $zone['continent'] );
 
@@ -3286 +3286 @@
                         // It's inside a continent group
                         
                         // Continent optgroup
-                        if ( !isset( $zonen[$key - 1] ) || $zonen[$key - 1]['continent'] !== $zone['continent'] ) {
+                        if ( !isset( $zones[$key - 1] ) || $zones[$key - 1]['continent'] !== $zone['continent'] ) {
                                 $label = ( 'Etc' === $zone['continent'] ) ? __( 'Manual offsets' ) : $zone['t_continent'];
                                 $structure[] = '<optgroup label="'. esc_attr( $label ) .'">';
                         }
@@ -3320 +3320 @@
                 $structure[] = '<option ' . $selected . 'value="' . esc_attr( $value ) . '">' . esc_html( $display ) . "</option>";
                 
                 // Close continent optgroup
-                if ( !empty( $zone['city'] ) && isset( $zonen[$key + 1] ) && $zonen[$key + 1]['continent'] !== $zone['continent'] ) {
+                if ( !empty( $zone['city'] ) && ( !isset($zones[$key + 1]) || (isset( $zones[$key + 1] ) && $zones[$key + 1]['continent'] !== $zone['continent']) ) ) {
                         $structure[] = '</optgroup>';
                 }
         }