Output final optgroup. Props hakre. fixes #10292 for trunk
git-svn-id: http://svn.automattic.com/wordpress/trunk@11677 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
f385e7da46
commit
7e5166665c
|
@ -3222,7 +3222,7 @@ function _wp_timezone_choice_usort_callback( $a, $b ) {
|
||||||
/**
|
/**
|
||||||
* Gives a nicely formatted list of timezone strings // temporary! Not in final
|
* 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 ) {
|
function wp_timezone_choice( $selected_zone ) {
|
||||||
|
@ -3320,7 +3320,7 @@ function wp_timezone_choice( $selected_zone ) {
|
||||||
$structure[] = '<option ' . $selected . 'value="' . esc_attr( $value ) . '">' . esc_html( $display ) . "</option>";
|
$structure[] = '<option ' . $selected . 'value="' . esc_attr( $value ) . '">' . esc_html( $display ) . "</option>";
|
||||||
|
|
||||||
// Close continent optgroup
|
// Close continent optgroup
|
||||||
if ( !empty( $zone['city'] ) && isset( $zonen[$key + 1] ) && $zonen[$key + 1]['continent'] !== $zone['continent'] ) {
|
if ( !empty( $zone['city'] ) && ( !isset($zonen[$key + 1]) || (isset( $zonen[$key + 1] ) && $zonen[$key + 1]['continent'] !== $zone['continent']) ) ) {
|
||||||
$structure[] = '</optgroup>';
|
$structure[] = '</optgroup>';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue