Replace the _ before sorting the timezones. Fixes #10066 props nbachiyski.
git-svn-id: http://svn.automattic.com/wordpress/trunk@11544 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
25c0c575b6
commit
0c2e8444c4
|
@ -3217,12 +3217,13 @@ function wp_timezone_choice($selectedzone) {
|
|||
|
||||
usort($zonen, create_function(
|
||||
'$a, $b', '
|
||||
$a_continent = translate($a["continent"], "continents-cities");
|
||||
$b_continent = translate($b["continent"], "continents-cities");
|
||||
$a_city = translate($a["city"], "continents-cities");
|
||||
$b_city = translate($b["city"], "continents-cities");
|
||||
$a_subcity = translate($a["subcity"], "continents-cities");
|
||||
$b_subcity = translate($b["subcity"], "continents-cities");
|
||||
$t = create_function(\'$s\', \'return translate(str_replace("_", " ", $s), "continents-cities");\');
|
||||
$a_continent = $t($a["continent"]);
|
||||
$b_continent = $t($b["continent"]);
|
||||
$a_city = $t($a["city"]);
|
||||
$b_city = $t($b["city"]);
|
||||
$a_subcity = $t($a["subcity"]);
|
||||
$b_subcity = $t($b["subcity"]);
|
||||
if ( $a_continent == $b_continent && $a_city == $b_city )
|
||||
return strnatcasecmp($a_subcity, $b_subcity);
|
||||
elseif ( $a_continent == $b_continent )
|
||||
|
|
Loading…
Reference in New Issue