[wp-cvs] wordpress/wp-includes functions.php,1.101.4.6,1.101.4.7

[Matthew Mullenweg]

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

Modified Files:
      Tag: WordPress-Ver-1_2-Branch
	functions.php 
Log Message:
XML-RPC Patch

Index: functions.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-includes/functions.php,v
retrieving revision 1.101.4.6
retrieving revision 1.101.4.7
diff -C2 -d -r1.101.4.6 -r1.101.4.7
*** functions.php	28 Nov 2004 05:26:20 -0000	1.101.4.6
--- functions.php	15 Dec 2004 19:01:52 -0000	1.101.4.7
***************
*** 21,25 ****
  }
  
! function mysql2date($dateformatstring, $mysqlstring, $use_b2configmonthsdays = 1) {
  	global $month, $weekday;
  	$m = $mysqlstring;
--- 21,26 ----
  }
  
! // patch by Adriaan Tijsseling (http://kung-foo.tv): added an option to return the UTC string
! function mysql2date($dateformatstring, $mysqlstring, $use_b2configmonthsdays = 1, $utc=0) {
  	global $month, $weekday;
  	$m = $mysqlstring;
***************
*** 28,31 ****
--- 29,36 ----
  	}
  	$i = mktime(substr($m,11,2),substr($m,14,2),substr($m,17,2),substr($m,5,2),substr($m,8,2),substr($m,0,4)); 
+ 	if ( $utc )
+ 	{
+         $i -= get_settings('gmt_offset') * 3600;
+ 	}
  	if (!empty($month) && !empty($weekday) && $use_b2configmonthsdays) {
  		$datemonth = $month[date('m', $i)];
***************
*** 43,46 ****
--- 48,53 ----
  	//	echo $i." ".$mysqlstring;
  	}
+ 	if ( $utc )
+ 	   return $j . 'Z';
  	return $j;
  }
***************
*** 1345,1353 ****
  	foreach ($words as $word) {
  	$word = trim($word);
- 
- 	// Do some escaping magic so that '#' chars in the 
- 	// spam words don't break things:
- 	$word = preg_quote($word, '#');
- 
  	$pattern = "#$word#i";
  		if ( preg_match($pattern, $author) ) return false;
--- 1352,1355 ----
***************
*** 1365,1370 ****
  }
  
- // Borrowed from the PHP Manual user notes. Convert entities, while
- // preserving already-encoded entities:
  function htmlentities2($myHTML) {
  	$translation_table=get_html_translation_table (HTML_ENTITIES,ENT_QUOTES);
--- 1367,1370 ----
***************
*** 1414,1416 ****
  }
  
! ?>
\ No newline at end of file
--- 1414,1416 ----
  }
  
! ?>