Ticket #2568: functions.php.diff

E:/PHP/WordPress/SVN/wp-includes/functions.php

@@ -16 +16 @@
 }
 
 function mysql2date($dateformatstring, $mysqlstring, $translate = true) {
-        global $month, $weekday, $month_abbrev, $weekday_abbrev;
+        global $month, $weekday, $month_abbrev, $weekday_abbrev, $meridiem;
         $m = $mysqlstring;
         if ( empty($m) ) {
                 return false;
@@ -31 +31 @@
                 $datemonth_abbrev = $month_abbrev[$datemonth];
                 $dateweekday = $weekday[date('w', $i)];
                 $dateweekday_abbrev = $weekday_abbrev[$dateweekday];
+                $datemeridiem = $meridiem[date('a', $i)];
+                $datemeridiem_capital = $meridiem[date('A', $i)];
                 $dateformatstring = ' '.$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($datemonth_abbrev), $dateformatstring);
+                $dateformatstring = preg_replace("/([^\\\])a/", "\\1".backslashit($datemeridiem), $dateformatstring);
+                $dateformatstring = preg_replace("/([^\\\])A/", "\\1".backslashit($datemeridiem_capital), $dateformatstring);
 
                 $dateformatstring = substr($dateformatstring, 1, strlen($dateformatstring)-1);
         }
@@ -63 +67 @@
 }
 
 function date_i18n($dateformatstring, $unixtimestamp) {
-        global $month, $weekday, $month_abbrev, $weekday_abbrev;
+        global $month, $weekday, $month_abbrev, $weekday_abbrev, $meridiem;
         $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];
+                $datemeridiem = $meridiem[date('a', $i)];
+                $datemeridiem_capital = $meridiem[date('A', $i)];
                 $dateformatstring = ' '.$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($datemonth_abbrev), $dateformatstring);
+                $dateformatstring = preg_replace("/([^\\\])a/", "\${1}".backslashit($datemeridiem), $dateformatstring);
+                $dateformatstring = preg_replace("/([^\\\])A/", "\${1}".backslashit($datemeridiem_capital), $dateformatstring);
+
                 $dateformatstring = substr($dateformatstring, 1, strlen($dateformatstring)-1);
         }
         $j = @date($dateformatstring, $i);