Changeset 9367

Timestamp:

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

Author:

ryan

Message:

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

Location:

trunk/wp-includes

Files:

• canonical.php (modified) (3 diffs)
• comment-template.php (modified) (3 diffs)
• comment.php (modified) (1 diff)

trunk/wp-includes/canonical.php

@@ -250 +250 @@
         $redirect_url = $redirect['scheme'] . '://' . $redirect['host'];
         if ( !empty($redirect['port']) )
-            $redirect_url .= ':' . $redirect['port'];
+            $redirect_url .= ':' . $redirect['port'];
         $redirect_url .= $redirect['path'];
         if ( !empty($redirect['query']) )
@@ -257 +257 @@
 
     if ( !$redirect_url || $redirect_url == $requested_url )
-        return false;
+        return false;
 
     // Note that you can use the "redirect_canonical" filter to cancel a canonical redirect for whatever reason by returning FALSE
@@ -263 +263 @@
 
     if ( !$redirect_url || $redirect_url == $requested_url ) // yes, again -- in case the filter aborted the request
-        return false;
+        return false;
 
     if ( $do_redirect ) {

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()) ?>

trunk/wp-includes/comment.php

@@ -521 +521 @@
 
 /**
+ * Calculate what page number a comment will appear on for comment paging.
+ *
+ * @since 2.7.0
+ *
+ * @param int $comment_ID Comment ID.
+ * @param int $per_page Optional comments per page.
+ * @return int|null Comment page number or null on error.
+ */
+function get_page_of_comment( $comment_ID, $per_page = null, $threaded = null ) {
+    if ( !$comment = get_comment( $comment_ID ) )
+        return;
+
+    if ( !get_option('page_comments') )
+        return 1;
+
+    $comments = array_reverse( get_comments( $comment->comment_post_ID ) );
+
+    if ( null === $per_page )
+        $per_page = get_option('comments_per_page');
+
+    if ( null === $threaded )
+        $threaded = get_option('thread_comments');
+
+    // Find this comment's top level parent
+    if ( $threaded ) {
+        while ( 0 != $comment->comment_parent )
+            $comment = get_comment( $comment->comment_parent );
+    }
+
+    // Start going through the comments until we find what page number the above top level comment is on
+    $page = 1;
+    $comthispage = 0;
+    foreach ( $comments as $com ) {
+        if ( $threaded && 0 != $com->comment_parent )
+            continue;
+
+        if ( $com->comment_ID == $comment->comment_ID )
+            return $page;
+
+        $comthispage++;
+
+        if ( $comthispage >= $per_page ) {
+            $page++;
+            $comthispage = 0;
+        }
+    }
+}
+
+/**
  * Does comment contain blacklisted characters or words.
  *