From 30554cccab4732c318f1b05ceb12f97f10af7e20 Mon Sep 17 00:00:00 2001 From: Scott Taylor Date: Thu, 24 Sep 2015 14:19:03 +0000 Subject: [PATCH] After [34492], no need to import the global instance when we are, in fact, currently, that instance. See #11694. git-svn-id: https://develop.svn.wordpress.org/trunk@34494 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/class-wp.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/wp-includes/class-wp.php b/src/wp-includes/class-wp.php index 4e859ee9e1..47f97d4d4d 100644 --- a/src/wp-includes/class-wp.php +++ b/src/wp-includes/class-wp.php @@ -587,7 +587,7 @@ class WP { * @global WP_Query $wp_query */ public function handle_404() { - global $wp_query, $wp; + global $wp_query; // If we've already issued a 404, bail. if ( is_404() ) @@ -606,8 +606,8 @@ class WP { // check for paged content that exceeds the max number of pages $next = ''; - if ( $p && false !== strpos( $p->post_content, $next ) && ! empty( $wp->query_vars['page'] ) ) { - $page = trim( $wp->query_vars['page'], '/' ); + if ( $p && false !== strpos( $p->post_content, $next ) && ! empty( $this->query_vars['page'] ) ) { + $page = trim( $this->query_vars['page'], '/' ); $success = (int) $page <= ( substr_count( $p->post_content, $next ) + 1 ); } }