[wp-cvs] wordpress/wp-includes comment-functions.php, 1.1, 1.2 vars.php, 1.37, 1.38

[Matthew Mullenweg]

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

Modified Files:
	comment-functions.php vars.php 
Log Message:
Let's get_ down

Index: vars.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-includes/vars.php,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** vars.php	16 Dec 2004 02:57:05 -0000	1.37
--- vars.php	16 Dec 2004 03:08:07 -0000	1.38
***************
*** 213,216 ****
--- 213,217 ----
  add_filter('comment_author', 'wptexturize');
  add_filter('comment_author', 'convert_chars');
+ add_filter('comment_author', 'wp_specialchars');
  
  add_filter('comment_email', 'antispambot');
***************
*** 223,226 ****
--- 224,229 ----
  add_filter('comment_text', 'convert_smilies', 20);
  
+ add_filter('comment_text_rss', 'htmlspecialchars');
+ 
  add_filter('comment_excerpt', 'convert_chars');
  

Index: comment-functions.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-includes/comment-functions.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** comment-functions.php	16 Dec 2004 02:57:05 -0000	1.1
--- comment-functions.php	16 Dec 2004 03:08:07 -0000	1.2
***************
*** 62,67 ****
  
  function comments_link( $file = '', $echo = true ) {
!     if (!$echo) return get_permalink() . '#comments';
!     else echo ;
  }
  
--- 62,70 ----
  
  function comments_link( $file = '', $echo = true ) {
!     echo get_comments_link();
! }
! 
! function comment_link_rss() {
! 	echo get_comments_link();
  }
  
***************
*** 149,152 ****
--- 152,160 ----
  }
  
+ function comment_author_rss() {
+ 	$author = apply_filters('comment_author_rss', get_comment_author() );
+ 	echo $author;
+ }
+ 
  function get_comment_author_email() {
  	global $comment;
***************
*** 245,248 ****
--- 253,262 ----
  }
  
+ function comment_text_rss() {
+ 	$comment_text = get_comment_text();
+ 	$comment_text = apply_filters('comment_text_rss', $comment_text);
+ 	echo $comment_text;
+ }
+ 
  function get_comment_excerpt() {
  	global $comment;
***************
*** 313,360 ****
  }
  
! function comment_author_rss() {
! 	global $comment;
! 	if (empty($comment->comment_author)) {
! 		echo 'Anonymous';
! 	} else {
! 		echo wp_specialchars(apply_filters('comment_author', $comment->comment_author));
! 	}
! }
! 
! function comment_text_rss() {
! 	global $comment;
! 	$comment_text = str_replace('<trackback />', '', $comment->comment_content);
! 	$comment_text = str_replace('<pingback />', '', $comment_text);
! 	$comment_text = apply_filters('comment_text', $comment_text);
! 	$comment_text = strip_tags($comment_text);
! 	$comment_text = wp_specialchars($comment_text);
! 	echo $comment_text;
! }
! 
! function comment_link_rss() {
! 	global $comment;
! 	echo get_permalink($comment->comment_post_ID).'#comments';
! }
! 
! function permalink_comments_rss() {
! 	global $comment;
! 	echo get_permalink($comment->comment_post_ID);
! }
! 
! function trackback_url($display = true) {
  	global $id;
  	$tb_url = get_settings('siteurl') . '/wp-trackback.php/' . $id;
! 	
! 	if ('' != get_settings('permalink_structure')) {
  		$tb_url = trailingslashit(get_permalink()) . 'trackback/';
- 	}
- 	
- 	if ($display) {
- 		echo $tb_url;
- 	} else {
- 		return $tb_url;
- 	}
- }
  
  
  function trackback_rdf($timezone = 0) {
--- 327,345 ----
  }
  
! function get_trackback_url() {
  	global $id;
  	$tb_url = get_settings('siteurl') . '/wp-trackback.php/' . $id;
! 
! 	if ( '' != get_settings('permalink_structure') )
  		$tb_url = trailingslashit(get_permalink()) . 'trackback/';
  
+ 	return $tb_url;
+ }
+ function trackback_url( $display = true ) {
+ 	if ( $display)
+ 		echo get_trackback_url();
+ 	else
+ 		return get_trackback_url();
+ }
  
  function trackback_rdf($timezone = 0) {
***************
*** 378,389 ****
  function comments_open() {
  	global $post;
! 	if ('open' == $post->comment_status) return true;
! 	else return false;
  }
  
  function pings_open() {
  	global $post;
! 	if ('open' == $post->ping_status) return true;
! 	else return false;
  }
  
--- 363,378 ----
  function comments_open() {
  	global $post;
! 	if ( 'open' == $post->comment_status )
! 		return true;
! 	else
! 		return false;
  }
  
  function pings_open() {
  	global $post;
! 	if ( 'open' == $post->ping_status ) 
! 		return true;
! 	else
! 		return false;
  }