[wp-cvs] wordpress/wp-includes comment-functions.php, 1.14, 1.15 functions-post.php, 1.30, 1.31

[Matthew Mullenweg]

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

Modified Files:
	comment-functions.php functions-post.php 
Log Message:
http://mosquito.wordpress.org/view.php?id=684

Index: comment-functions.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-includes/comment-functions.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** comment-functions.php	10 Jan 2005 23:21:42 -0000	1.14
--- comment-functions.php	15 Jan 2005 01:07:52 -0000	1.15
***************
*** 616,620 ****
  }
  
! function wp_notify_postauthor($comment_id, $comment_type='comment') {
      global $wpdb;
      global $querystring_start, $querystring_equal, $querystring_separator;
--- 616,620 ----
  }
  
! function wp_notify_postauthor($comment_id, $comment_type='') {
      global $wpdb;
      global $querystring_start, $querystring_equal, $querystring_separator;
***************
*** 630,633 ****
--- 630,635 ----
  	$blogname = get_settings('blogname');
  	
+ 	if ( empty( $comment_type ) ) $comment_type = 'comment';
+ 	
  	if ('comment' == $comment_type) {
  		$notify_message  = "New comment on your post #$comment->comment_post_ID \"".$post->post_title."\"\r\n\r\n";
***************
*** 655,658 ****
--- 657,661 ----
  	}
  	$notify_message .= get_permalink($comment->comment_post_ID) . '#comments';
+ 	$notify_message .= "\r\n\r\nTo delete this comment, visit: " . get_settings('siteurl') . "/wp-admin/post.php?action=confirmdeletecomment&p=".$comment->comment_post_ID."&comment=$comment_id";
  
  	if ('' == $comment->comment_author_email || '' == $comment->comment_author) {

Index: functions-post.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-includes/functions-post.php,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** functions-post.php	11 Jan 2005 22:42:09 -0000	1.30
--- functions-post.php	15 Jan 2005 01:07:53 -0000	1.31
***************
*** 477,481 ****
  	
  		if ( get_settings('comments_notify') && $approved )
! 			wp_notify_postauthor($comment_id, 'comment');
  	}
  
--- 477,481 ----
  	
  		if ( get_settings('comments_notify') && $approved )
! 			wp_notify_postauthor($comment_id, $comment_type);
  	}