From 4510a068d477d155464aec43e63b116801ac8614 Mon Sep 17 00:00:00 2001 From: ryan Date: Tue, 10 Mar 2009 15:26:52 +0000 Subject: [PATCH] Filter continents in the first loop. see #3962 git-svn-id: http://svn.automattic.com/wordpress/trunk@10756 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/functions.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/wp-includes/functions.php b/wp-includes/functions.php index c88e98241..e998a85cd 100644 --- a/wp-includes/functions.php +++ b/wp-includes/functions.php @@ -3094,11 +3094,15 @@ function wp_timezone_supported() { * */ function wp_timezone_choice($selectedzone) { + $continents = array('Africa', 'America', 'Antarctica', 'Arctic', 'Asia', 'Atlantic', 'Australia', 'Europe', 'Indian', 'Pacific', 'Etc'); + $all = timezone_identifiers_list(); $i = 0; 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] : ''; $zonen[$i]['subcity'] = isset($zone[2]) ? $zone[2] : ''; @@ -3109,14 +3113,10 @@ function wp_timezone_choice($selectedzone) { $structure = ''; $pad = '   '; - $continents = array('Africa', 'America', 'Antarctica', 'Arctic', 'Asia', 'Atlantic', 'Australia', 'Europe', 'Indian', 'Pacific', 'Etc'); - if ( empty($selectedzone) ) $structure .= '\n"; foreach ( $zonen as $zone ) { extract($zone); - if ( ! in_array($continent, $continents) ) - continue; if ( empty($selectcontinent) && !empty($city) ) { $selectcontinent = $continent; $structure .= '' . "\n"; // continent