[wp-cvs] wordpress/wp-includes comment-functions.php, 1.4, 1.5 functions-post.php, 1.20, 1.21

[Matthew Mullenweg]

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

Modified Files:
	comment-functions.php functions-post.php 
Log Message:
Comment notification fixes

Index: comment-functions.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-includes/comment-functions.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** comment-functions.php	17 Dec 2004 08:48:30 -0000	1.4
--- comment-functions.php	17 Dec 2004 10:24:39 -0000	1.5
***************
*** 726,730 ****
  function wp_notify_moderator($comment_id) {
      global $wpdb;
-     global $querystring_start, $querystring_equal, $querystring_separator;
  
      if( get_settings( "moderation_notify" ) == 0 )
--- 726,729 ----
***************
*** 738,743 ****
      $comments_waiting = $wpdb->get_var("SELECT count(comment_ID) FROM $wpdb->comments WHERE comment_approved = '0'");
  
!     $notify_message  = "A new comment on the post #$comment->comment_post_ID \"".$post->post_title."\" is waiting for your approval\r\n\r\n";
!     $notify_message .= "Author : $comment->comment_author (IP: $comment->comment_author_IP , $comment_author_domain)\r\n";
      $notify_message .= "E-mail : $comment->comment_author_email\r\n";
      $notify_message .= "URL    : $comment->comment_author_url\r\n";
--- 737,743 ----
      $comments_waiting = $wpdb->get_var("SELECT count(comment_ID) FROM $wpdb->comments WHERE comment_approved = '0'");
  
!     $notify_message  = "A new comment on the post #$comment->comment_post_ID \"".$post->post_title."\" is waiting for your approval\n";
! 	$notify_message .= get_permalink($comment->comment_post_ID);
!     $notify_message .= "\n\nAuthor : $comment->comment_author (IP: $comment->comment_author_IP , $comment_author_domain)\r\n";
      $notify_message .= "E-mail : $comment->comment_author_email\r\n";
      $notify_message .= "URL    : $comment->comment_author_url\r\n";
***************
*** 749,753 ****
      $notify_message .= get_settings('siteurl') . "/wp-admin/moderation.php\r\n";
  
!     $subject = '[' . get_settings('blogname') . '] Please approve: "' .$post->post_title.'"';
      $admin_email = get_settings("admin_email");
      $from  = "From: $admin_email";
--- 749,753 ----
      $notify_message .= get_settings('siteurl') . "/wp-admin/moderation.php\r\n";
  
!     $subject = '[' . get_settings('blogname') . '] Please moderate: "' .$post->post_title.'"';
      $admin_email = get_settings("admin_email");
      $from  = "From: $admin_email";

Index: functions-post.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-includes/functions-post.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** functions-post.php	16 Dec 2004 02:57:05 -0000	1.20
--- functions-post.php	17 Dec 2004 10:25:00 -0000	1.21
***************
*** 427,434 ****
  
  	if ( !$approved )
! 		wp_notify_moderator($comment_ID);
  
  	if ( get_settings('comments_notify') && $approved )
! 		wp_notify_postauthor($comment_ID, 'comment');
  
  	return $result;
--- 427,434 ----
  
  	if ( !$approved )
! 		wp_notify_moderator($comment_id);
  
  	if ( get_settings('comments_notify') && $approved )
! 		wp_notify_postauthor($comment_id, 'comment');
  
  	return $result;