Changes from branches/3.0/wp-includes/comment-template.php at r15434 to trunk/wp-includes/comment-template.php at r17071

File:

• trunk/wp-includes/comment-template.php (modified) (21 diffs)

trunk/wp-includes/comment-template.php

@@ -163 +163 @@
  * @see get_comment_author_link() Echoes result
  *
- * @param int The ID of the comment for which to print the author's link. Optional.
+ * @param int $comment_ID The ID of the comment for which to print the author's link. Optional.
  */
 function comment_author_link( $comment_ID = 0 ) {
@@ -546 +546 @@
  */
 function get_comments_number( $post_id = 0 ) {
-    global $id;
-    $post_id = (int) $post_id;
+    $post_id = absint( $post_id );
 
     if ( !$post_id )
-        $post_id = (int) $id;
+        $post_id = get_the_ID();
 
     $post = get_post($post_id);
@@ -565 +564 @@
  *
  * @since 0.71
- * @uses $id
  * @uses apply_filters() Calls the 'comments_number' hook on the output and number of comments respectively.
  *
@@ -574 +572 @@
  */
 function comments_number( $zero = false, $one = false, $more = false, $deprecated = '' ) {
-    global $id;
-
     if ( !empty( $deprecated ) )
         _deprecated_argument( __FUNCTION__, '1.3' );
 
-    $number = get_comments_number($id);
+    $number = get_comments_number();
 
     if ( $number > 1 )
@@ -602 +598 @@
 function get_comment_text( $comment_ID = 0 ) {
     $comment = get_comment( $comment_ID );
-    return apply_filters('get_comment_text', $comment->comment_content);
+    return apply_filters( 'get_comment_text', $comment->comment_content, $comment );
 }
 
@@ -615 +611 @@
  */
 function comment_text( $comment_ID = 0 ) {
-    echo apply_filters('comment_text', get_comment_text() );
+    $comment = get_comment( $comment_ID );
+    echo apply_filters( 'comment_text', get_comment_text( $comment_ID ), $comment );
 }
 
@@ -679 +676 @@
  */
 function comment_type($commenttxt = false, $trackbacktxt = false, $pingbacktxt = false) {
-    if ( false === $commenttxt ) $commenttxt = _x( 'Comment', 'noun' );
-    if ( false === $trackbacktxt ) $trackbacktxt = __( 'Trackback' );
-    if ( false === $pingbacktxt ) $pingbacktxt = __( 'Pingback' );
+    if ( false === $commenttxt ) $commenttxt = _x( 'Comment', 'noun' );
+    if ( false === $trackbacktxt ) $trackbacktxt = __( 'Trackback' );
+    if ( false === $pingbacktxt ) $pingbacktxt = __( 'Pingback' );
     $type = get_comment_type();
     switch( $type ) {
@@ -704 +701 @@
  * @since 1.5.0
  * @uses apply_filters() Calls 'trackback_url' on the resulting trackback URL
- * @uses $id
  *
  * @return string The trackback URL after being filtered
  */
 function get_trackback_url() {
-    global $id;
     if ( '' != get_option('permalink_structure') ) {
         $tb_url = trailingslashit(get_permalink()) . user_trailingslashit('trackback', 'single_trackback');
     } else {
-        $tb_url = get_option('siteurl') . '/wp-trackback.php?p=' . $id;
+        $tb_url = get_option('siteurl') . '/wp-trackback.php?p=' . get_the_ID();
     }
     return apply_filters('trackback_url', $tb_url);
@@ -748 +743 @@
     if ( !empty( $deprecated ) )
         _deprecated_argument( __FUNCTION__, '2.5' );
+
+    if ( false !== stripos($_SERVER['HTTP_USER_AGENT'], 'W3C_Validator') )
+        return;
 
     echo '<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
@@ -842 +840 @@
  * @global array $comment List of comment objects for the current post
  * @uses $wpdb
- * @uses $id
  * @uses $post
  * @uses $withcomments Will not try to get the comments if the post has none.
@@ -959 +956 @@
  *
  * @since 0.71
- * @uses $id
  * @uses $wpcommentspopupfile
  * @uses $wpcommentsjavascript
@@ -972 +968 @@
  */
 function comments_popup_link( $zero = false, $one = false, $more = false, $css_class = '', $none = false ) {
-    global $id, $wpcommentspopupfile, $wpcommentsjavascript;
-
-    if ( false === $zero ) $zero = __( 'No Comments' );
-    if ( false === $one ) $one = __( '1 Comment' );
-    if ( false === $more ) $more = __( '% Comments' );
-    if ( false === $none ) $none = __( 'Comments Off' );
+    global $wpcommentspopupfile, $wpcommentsjavascript;
+
+    $id = get_the_ID();
+
+    if ( false === $zero ) $zero = __( 'No Comments' );
+    if ( false === $one ) $one = __( '1 Comment' );
+    if ( false === $more ) $more = __( '% Comments' );
+    if ( false === $none ) $none = __( 'Comments Off' );
 
     $number = get_comments_number( $id );
@@ -1062 +1060 @@
         $link = '<a rel="nofollow" class="comment-reply-login" href="' . esc_url( wp_login_url( get_permalink() ) ) . '">' . $login_text . '</a>';
     else
-        $link = "<a rel='nofollow' class='comment-reply-link' href='" . esc_url( add_query_arg( 'replytocom', $comment->comment_ID ) ) . "#" . $respond_id . "' onclick='return addComment.moveForm(\"$add_below-$comment->comment_ID\", \"$comment->comment_ID\", \"$respond_id\", \"$post->ID\")'>$reply_text</a>";
+        $link = "<a class='comment-reply-link' href='" . esc_url( add_query_arg( 'replytocom', $comment->comment_ID ) ) . "#" . $respond_id . "' onclick='return addComment.moveForm(\"$add_below-$comment->comment_ID\", \"$comment->comment_ID\", \"$respond_id\", \"$post->ID\")'>$reply_text</a>";
     return apply_filters('comment_reply_link', $before . $link . $after, $args, $comment, $post);
 }
@@ -1166 +1164 @@
  */
 function get_comment_id_fields() {
-    global $id;
+    $id = get_the_ID();
 
     $replytoid = isset($_GET['replytocom']) ? (int) $_GET['replytocom'] : 0;
@@ -1215 +1213 @@
  * @package WordPress
  * @uses Walker
- * @since unknown
+ * @since 2.7.0
  */
 class Walker_Comment extends Walker {
     /**
      * @see Walker::$tree_type
-     * @since unknown
+     * @since 2.7.0
      * @var string
      */
@@ -1227 +1225 @@
     /**
      * @see Walker::$db_fields
-     * @since unknown
+     * @since 2.7.0
      * @var array
      */
@@ -1234 +1232 @@
     /**
      * @see Walker::start_lvl()
-     * @since unknown
+     * @since 2.7.0
      *
      * @param string $output Passed by reference. Used to append additional content.
@@ -1258 +1256 @@
     /**
      * @see Walker::end_lvl()
-     * @since unknown
+     * @since 2.7.0
      *
      * @param string $output Passed by reference. Used to append additional content.
@@ -1321 +1319 @@
     /**
      * @see Walker::start_el()
-     * @since unknown
+     * @since 2.7.0
      *
      * @param string $output Passed by reference. Used to append additional content.
@@ -1357 +1355 @@
         </div>
 <?php if ($comment->comment_approved == '0') : ?>
-        <em><?php _e('Your comment is awaiting moderation.') ?></em>
+        <em class="comment-awaiting-moderation"><?php _e('Your comment is awaiting moderation.') ?></em>
         <br />
 <?php endif; ?>
@@ -1381 +1379 @@
     /**
      * @see Walker::end_el()
-     * @since unknown
+     * @since 2.7.0
      *
      * @param string $output Passed by reference. Used to append additional content.