Ticket #8058: 8058.3.patch

wp-includes/link-template.php

@@ -1245 +1245 @@
 }
 
 /**
- * Display link to next comments pages.
+ * Return the link to next comments pages.
  *
- * @since 2.7.0
+ * @since 2.7.1
  *
  * @param string $label Optional. Label for link text.
  * @param int $max_page Optional. Max page.
+ * @return string|null
  */
-function next_comments_link($label='', $max_page = 0) {
+function get_next_comments_link( $label = '', $max_page = 0 ) {
         global $wp_query;
 
         if ( !is_singular() )
@@ -1277 +1278 @@
         if ( empty($label) )
                 $label = __('Newer Comments »');
 
-        echo '<a href="' . clean_url( get_comments_pagenum_link( $nextpage, $max_page ) );
-        $attr = apply_filters( 'next_comments_link_attributes', '' );
-        echo "\" $attr>". preg_replace('/&([^#])(?![a-z]{1,8};)/', '&#038;$1', $label) .'</a>';
+        return '<a href="' . clean_url( get_comments_pagenum_link( $nextpage, $max_page ) ) . '" ' . apply_filters( 'next_comments_link_attributes', '' ) . '>'. preg_replace('/&([^#])(?![a-z]{1,8};)/', '&#038;$1', $label) .'</a>';
 }
 
 /**
- * Display the previous comments page link.
+ * Display the link to next comments pages.
  *
  * @since 2.7.0
  *
+ * @param string $label Optional. Label for link text.
+ * @param int $max_page Optional. Max page.
+ */
+function next_comments_link( $label = '', $max_page = 0 ) {
+        echo get_next_comments_link( $label, $max_page );
+}
+
+/**
+ * Return the previous comments page link.
+ *
+ * @since 2.7.1
+ *
  * @param string $label Optional. Label for comments link text.
+ * @return string|null
  */
-function previous_comments_link($label='') {
-
+function get_previous_comments_link( $label = '' ) {
         if ( !is_singular() )
                 return;
 
@@ -1307 +1318 @@
         if ( empty($label) )
                 $label = __('&laquo; Older Comments');
 
-        echo '<a href="' . clean_url(get_comments_pagenum_link($prevpage));
-        $attr = apply_filters( 'previous_comments_link_attributes', '' );
-        echo "\" $attr>". preg_replace('/&([^#])(?![a-z]{1,8};)/', '&#038;$1', $label) .'</a>';
+        return '<a href="' . clean_url( get_comments_pagenum_link( $prevpage ) ) . '" ' . apply_filters( 'previous_comments_link_attributes', '' ) . '>' . preg_replace('/&([^#])(?![a-z]{1,8};)/', '&#038;$1', $label) .'</a>';
 }
 
 /**
+ * Display the previous comments page link.
+ *
+ * @since 2.7.0
+ *
+ * @param string $label Optional. Label for comments link text.
+ */
+function previous_comments_link( $label = '' ) {
+        echo get_previous_comments_link( $label );
+}
+
+/**
  * Create pagination links for the comments on the current post.
  *
  * @see paginate_links()