sergiotarxz
/
Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.

git-svn-id: https://develop.svn.wordpress.org/trunk@42703 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Sergey Biryukov 2018-02-12 21:11:13 +00:00
parent a62a77eeb7
commit 6a43b1658f
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/wp-includes/general-template.php
View File

@ -3768,7 +3768,7 @@ function language_attributes( $doctype = 'html' ) {
* @type string $before_page_number A string to appear before the page number. Default empty.
* @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 = '' ) {
global $wp_query, $wp_rewrite;

4
src/wp-includes/link-template.php
View File

@ -2896,7 +2896,7 @@ function previous_comments_link( $label = '' ) {
* @global WP_Rewrite $wp_rewrite
*
* @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() ) {
global $wp_rewrite;
@ -2925,7 +2925,7 @@ function paginate_comments_links( $args = array() ) {
$args = wp_parse_args( $args, $defaults );
$page_links = paginate_links( $args );
if ( $args['echo'] ) {
if ( $args['echo'] && 'array' !== $args['type'] ) {
echo $page_links;
} else {
return $page_links;