Changeset 9367 for trunk/wp-includes/comment-template.php

Timestamp:

10/27/2008 04:31:26 PM (16 years ago)

Author:

ryan

Message:

Make get_comment_link() paging aware. Props Viper007Bond. see #7956

File:

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

trunk/wp-includes/comment-template.php

@@ -403 +403 @@
 
 /**
- * Retrieve the link to the current comment.
+ * Retrieve the link to a given comment.
  *
  * @since 1.5.0
@@ -412 +412 @@
  */
 function get_comment_link($comment = null) {
+    global $wp_rewrite;
+
     $comment = get_comment($comment);
-    return get_permalink( $comment->comment_post_ID ) . '#comment-' . $comment->comment_ID;
+
+    if ( get_option('page_comments') ) {
+        $page = get_page_of_comment( $comment->comment_ID );
+
+        if ( $wp_rewrite->using_permalinks() )
+            return user_trailingslashit( trailingslashit( get_permalink( $comment->comment_post_ID ) ) . "comment-page-$page", 'comment' ) . '#comment-' . $comment->comment_ID;
+        else
+            return add_query_arg( 'cpage', $page, get_permalink( $comment->comment_post_ID ) ) . '#comment-' . $comment->comment_ID;
+    } else {
+        return get_permalink( $comment->comment_post_ID ) . '#comment-' . $comment->comment_ID;
+    }
 }
 
@@ -1086 +1098 @@
 <?php endif; ?>
 
-        <div class="comment-meta commentmetadata"><a href="#comment-<?php comment_ID() ?>" title=""><?php printf(__('%1$s at %2$s'), get_comment_date('F jS, Y'),  get_comment_time()) ?></a><?php edit_comment_link('edit','&nbsp;&nbsp;','') ?></div>
+        <div class="comment-meta commentmetadata"><a href="<?php echo htmlspecialchars( get_comment_link( $comment->comment_ID ) ) ?>"><?php printf(__('%1$s at %2$s'), get_comment_date('F jS, Y'),  get_comment_time()) ?></a><?php edit_comment_link('edit','&nbsp;&nbsp;','') ?></div>
 
         <?php echo apply_filters('comment_text', get_comment_text()) ?>