[wp-cvs] wordpress/wp-includes comment-functions.php,1.18,1.19

[Matthew Mullenweg]

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

Modified Files:
	comment-functions.php 
Log Message:
Fix pingback emails - http://mosquito.wordpress.org/view.php?id=729 - and also allow redefinition of wp_notify functions

Index: comment-functions.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-includes/comment-functions.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** comment-functions.php	21 Jan 2005 18:24:13 -0000	1.18
--- comment-functions.php	24 Jan 2005 06:37:20 -0000	1.19
***************
*** 616,619 ****
--- 616,620 ----
  }
  
+ if ( ! function_exists('wp_notify_postauthor') ) {
  function wp_notify_postauthor($comment_id, $comment_type='') {
      global $wpdb;
***************
*** 638,642 ****
  		$notify_message .= "URI    : $comment->comment_author_url\r\n";
  		$notify_message .= "Whois  : http://ws.arin.net/cgi-bin/whois.pl?queryinput=$comment->comment_author_IP\r\n";
! 		$notify_message .= "Comment:\r\n".$comment->comment_content."\r\n\r\n";
  		$notify_message .= "You can see all comments on this post here: \r\n";
  		$subject = '[' . $blogname . '] Comment: "' .$post->post_title.'"';
--- 639,643 ----
  		$notify_message .= "URI    : $comment->comment_author_url\r\n";
  		$notify_message .= "Whois  : http://ws.arin.net/cgi-bin/whois.pl?queryinput=$comment->comment_author_IP\r\n";
! 		$notify_message .= "Comment:\r\n $comment->comment_content \r\n\r\n";
  		$notify_message .= "You can see all comments on this post here: \r\n";
  		$subject = '[' . $blogname . '] Comment: "' .$post->post_title.'"';
***************
*** 645,649 ****
  		$notify_message .= "Website: $comment->comment_author (IP: $comment->comment_author_IP , $comment_author_domain)\r\n";
  		$notify_message .= "URI    : $comment->comment_author_url\r\n";
! 		$notify_message .= "Excerpt: \n".$comment->comment_content."\r\n\r\n";
  		$notify_message .= "You can see all trackbacks on this post here: \r\n";
  		$subject = '[' . $blogname . '] Trackback: "' .$post->post_title.'"';
--- 646,650 ----
  		$notify_message .= "Website: $comment->comment_author (IP: $comment->comment_author_IP , $comment_author_domain)\r\n";
  		$notify_message .= "URI    : $comment->comment_author_url\r\n";
! 		$notify_message .= "Excerpt: \n $comment->comment_content \r\n\r\n";
  		$notify_message .= "You can see all trackbacks on this post here: \r\n";
  		$subject = '[' . $blogname . '] Trackback: "' .$post->post_title.'"';
***************
*** 652,656 ****
  		$notify_message .= "Website: $comment->comment_author\r\n";
  		$notify_message .= "URI    : $comment->comment_author_url\r\n";
! 		$notify_message .= "Excerpt: \n[...] $original_context [...]\r\n\r\n";
  		$notify_message .= "You can see all pingbacks on this post here: \r\n";
  		$subject = '[' . $blogname . '] Pingback: "' .$post->post_title.'"';
--- 653,657 ----
  		$notify_message .= "Website: $comment->comment_author\r\n";
  		$notify_message .= "URI    : $comment->comment_author_url\r\n";
! 		$notify_message .= "Excerpt: \n[...] $comment->comment_content [...]\r\n\r\n";
  		$notify_message .= "You can see all pingbacks on this post here: \r\n";
  		$subject = '[' . $blogname . '] Pingback: "' .$post->post_title.'"';
***************
*** 673,676 ****
--- 674,678 ----
      return true;
  }
+ }
  
  /* wp_notify_moderator
***************
*** 679,682 ****
--- 681,685 ----
     always returns true
   */
+ if ( !function_exists('wp_notify_moderator') ) {
  function wp_notify_moderator($comment_id) {
      global $wpdb;
***************
*** 716,719 ****
--- 719,723 ----
      return true;
  }
+ }
  
  function check_comment($author, $email, $url, $comment, $user_ip, $user_agent, $comment_type) {