Changeset 1965

Timestamp:

12/16/2004 03:08:07 AM (21 years ago)

Author:

saxmatt

Message:

Let's get_ down

Location:

trunk/wp-includes

Files:

• comment-functions.php (modified) (5 diffs)
• vars.php (modified) (2 diffs)

trunk/wp-includes/comment-functions.php

@@ -62 +62 @@
 
 function comments_link( $file = '', $echo = true ) {
-    if (!$echo) return get_permalink() . '#comments';
-    else echo ;
+    echo get_comments_link();
+}
+
+function comment_link_rss() {
+    echo get_comments_link();
 }
 
@@ -149 +152 @@
 }
 
+function comment_author_rss() {
+    $author = apply_filters('comment_author_rss', get_comment_author() );
+    echo $author;
+}
+
 function get_comment_author_email() {
     global $comment;
@@ -245 +253 @@
 }
 
+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 +327 @@
 }
 
-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) {
+function get_trackback_url() {
     global $id;
     $tb_url = get_settings('siteurl') . '/wp-trackback.php/' . $id;
-    
-    if ('' != get_settings('permalink_structure')) {
+
+    if ( '' != get_settings('permalink_structure') )
         $tb_url = trailingslashit(get_permalink()) . 'trackback/';
-    }
-    
-    if ($display) {
-        echo $tb_url;
-    } else {
-        return $tb_url;
-    }
-}
-
+
+    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 +363 @@
 function comments_open() {
     global $post;
-    if ('open' == $post->comment_status) return true;
-    else return false;
+    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;
+    if ( 'open' == $post->ping_status ) 
+        return true;
+    else
+        return false;
 }
 

trunk/wp-includes/vars.php

@@ -213 +213 @@
 add_filter('comment_author', 'wptexturize');
 add_filter('comment_author', 'convert_chars');
+add_filter('comment_author', 'wp_specialchars');
 
 add_filter('comment_email', 'antispambot');
@@ -223 +224 @@
 add_filter('comment_text', 'convert_smilies', 20);
 
+add_filter('comment_text_rss', 'htmlspecialchars');
+
 add_filter('comment_excerpt', 'convert_chars');