Changeset 11288

Timestamp:

05/12/2009 12:32:36 AM (15 years ago)

Author:

ryan

Message:

Fix sign of GMT offsets. Props Denis-de-Bernardy. fixes #9758

File:

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

trunk/wp-includes/functions.php

@@ -3115 +3115 @@
     }
 
-    asort($zonen);
+    usort($zonen, create_function(
+        '$a, $b', '
+        if ( $a["continent"] == $b["continent"] && $a["city"] == $b["city"] )
+            return strnatcasecmp($a["subcity"], $b["subcity"]);
+        elseif ( $a["continent"] == $b["continent"] )
+            return strnatcasecmp($a["city"], $b["city"]);
+        else
+            return strnatcasecmp($a["continent"], $b["continent"]);
+        '));
+    
     $structure = '';
     $pad = '   ';
@@ -3139 +3148 @@
                 $city = $city . '/'. $subcity;
             }
-            $structure .= "\t<option ".((($continent.'/'.$city)==$selectedzone)?'selected="selected"':'')." value=\"".($continent.'/'.$city)."\">$pad".str_replace('_',' ',$city)."</option>\n"; //Timezone
+            $display = str_replace('_',' ',$city);
+            if ( $continent == 'Etc' )
+                $display = strtr($display, '+-', '-+');
+            $structure .= "\t<option ".((($continent.'/'.$city)==$selectedzone)?'selected="selected"':'')." value=\"".($continent.'/'.$city)."\">$pad".$display."</option>\n"; //Timezone
         } else {
             $structure .= "<option ".(($continent==$selectedzone)?'selected="selected"':'')." value=\"".$continent."\">".$continent."</option>\n"; //Timezone