[wp-cvs] wordpress/wp-includes functions.php,1.214,1.215

[Ryan Boren]

Update of /cvsroot/cafelog/wordpress/wp-includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1133

Modified Files:
	functions.php 
Log Message:
Use weekday locale data in mysql2date. Bug 492.  Patch by nbachiyski.

Index: functions.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-includes/functions.php,v
retrieving revision 1.214
retrieving revision 1.215
diff -C2 -d -r1.214 -r1.215
*** functions.php	24 Nov 2004 00:12:46 -0000	1.214
--- functions.php	25 Nov 2004 16:23:24 -0000	1.215
***************
*** 17,21 ****
  
  function mysql2date($dateformatstring, $mysqlstring, $use_b2configmonthsdays = 1) {
! 	global $month, $weekday;
  	$m = $mysqlstring;
  	if (empty($m)) {
--- 17,21 ----
  
  function mysql2date($dateformatstring, $mysqlstring, $use_b2configmonthsdays = 1) {
! 	global $month, $weekday, $month_abbrev, $weekday_abbrev;
  	$m = $mysqlstring;
  	if (empty($m)) {
***************
*** 25,34 ****
  	if (!empty($month) && !empty($weekday) && $use_b2configmonthsdays) {
  		$datemonth = $month[date('m', $i)];
  		$dateweekday = $weekday[date('w', $i)];
  		$dateformatstring = ' '.$dateformatstring;
! 		$dateformatstring = preg_replace("/([^\\\])D/", "\\1".backslashit(substr($dateweekday, 0, 3)), $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 = substr($dateformatstring, 1, strlen($dateformatstring)-1);
  	}
--- 25,37 ----
  	if (!empty($month) && !empty($weekday) && $use_b2configmonthsdays) {
  		$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($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 = substr($dateformatstring, 1, strlen($dateformatstring)-1);
  	}