Changeset 42703

Timestamp:

02/12/2018 09:11:13 PM (7 years ago)

Author:

SergeyBiryukov

Message:

Comments: Avoid a PHP notice in paginate_comments_links() if type argument is set to array.

The function is a wrapper for paginate_links(), which returns an array if requested.

Props anantajitjg.
Fixes #43299.

Location:

trunk/src/wp-includes

Files:

• general-template.php (modified) (1 diff)
• link-template.php (modified) (2 diffs)

trunk/src/wp-includes/general-template.php

@@ -3769 +3769 @@
  *     @type string $after_page_number  A string to append after the page number. Default empty.
  * }
- * @return array|string|void String of page links or array of page links.
+ * @return string|array|void String of page links or array of page links.
  */
 function paginate_links( $args = '' ) {

trunk/src/wp-includes/link-template.php

@@ -2897 +2897 @@
  *
  * @param string|array $args Optional args. See paginate_links(). Default empty array.
- * @return string|void Markup for pagination links.
+ * @return string|array|void Markup for comment page links or array of comment page links.
  */
 function paginate_comments_links( $args = array() ) {
@@ -2926 +2926 @@
     $page_links = paginate_links( $args );
 
-    if ( $args['echo'] ) {
+    if ( $args['echo'] && 'array' !== $args['type'] ) {
         echo $page_links;
     } else {