Changeset 2508

Timestamp:

04/02/2005 07:51:12 PM (21 years ago)

Author:

ryan

Message:

Don't use i18n unfriendly substr operations in date_i18n. ​http://mosquito.wordpress.org/view.php?id=1200 Props: nbachiyski

File:

• trunk/wp-includes/functions.php (modified) (1 diff)

trunk/wp-includes/functions.php

@@ -60 +60 @@
 
 function date_i18n($dateformatstring, $unixtimestamp) {
-    global $month, $weekday;
+    global $month, $weekday, $month_abbrev, $weekday_abbrev;
     $i = $unixtimestamp; 
     if ((!empty($month)) && (!empty($weekday))) {
         $datemonth = $month[date('m', $i)];
+        $datemonth_abbrev = $month_abbrev[$datemonth];
         $dateweekday = $weekday[date('w', $i)];
+        $dateweekday_abbrev = $weekday_abbrev[$dateweekday];        
         $dateformatstring = ' '.$dateformatstring;
-        $dateformatstring = preg_replace("/([^\\\])D/", "\\1".backslashit(substr($dateweekday, 0, 3)), $dateformatstring);
+        $dateformatstring = preg_replace("/([^\\\])D/", "\\1".backslashit($dateweekday_abbrev), $dateformatstring);
         $dateformatstring = preg_replace("/([^\\\])F/", "\\1".backslashit($datemonth), $dateformatstring);
         $dateformatstring = preg_replace("/([^\\\])l/", "\\1".backslashit($dateweekday), $dateformatstring);
-        $dateformatstring = preg_replace("/([^\\\])M/", "\\1".backslashit(substr($datemonth, 0, 3)), $dateformatstring);
+        $dateformatstring = preg_replace("/([^\\\])M/", "\\1".backslashit($datemonth_abbrev), $dateformatstring);
         $dateformatstring = substr($dateformatstring, 1, strlen($dateformatstring)-1);
     }