From aa3b4f911d6c8ce894fdcdf47767c11e557575ca Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Fri, 21 Oct 2016 10:46:29 +0000 Subject: [PATCH] Remove an obsolete `1 == $total` check in `paginate_links()`. `$total` cannot be a negative number since [4276]. Props jdgrimes. Fixes #38421. Built from https://develop.svn.wordpress.org/trunk@38857 git-svn-id: http://core.svn.wordpress.org/trunk@38800 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/general-template.php | 2 +- wp-includes/version.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/wp-includes/general-template.php b/wp-includes/general-template.php index c6fc86a09d..5174936de1 100644 --- a/wp-includes/general-template.php +++ b/wp-includes/general-template.php @@ -3324,7 +3324,7 @@ function paginate_links( $args = '' ) { endif; endif; endfor; - if ( $args['prev_next'] && $current && ( $current < $total || -1 == $total ) ) : + if ( $args['prev_next'] && $current && $current < $total ) : $link = str_replace( '%_%', $args['format'], $args['base'] ); $link = str_replace( '%#%', $current + 1, $link ); if ( $add_args ) diff --git a/wp-includes/version.php b/wp-includes/version.php index 16334c9eb3..43e3aef5b3 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.7-alpha-38856'; +$wp_version = '4.7-alpha-38857'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.