From b45178379baa5ef404cb75aef730486a3e4c7bee Mon Sep 17 00:00:00 2001
From: Scott Taylor <scott.c.taylor@mac.com>
Date: Thu, 24 Sep 2015 14:20:24 +0000
Subject: [PATCH] After [34492], no need to import the global instance when we
 are, in fact, currently, that instance.

See #11694.

Built from https://develop.svn.wordpress.org/trunk@34494


git-svn-id: http://core.svn.wordpress.org/trunk@34458 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/class-wp.php | 6 +++---
 wp-includes/version.php  | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/wp-includes/class-wp.php b/wp-includes/class-wp.php
index 4e859ee9e1..47f97d4d4d 100644
--- a/wp-includes/class-wp.php
+++ b/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 = '<!--nextpage-->';
-				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 );
 				}
 			}
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 44c1a348b9..fbd6b53eb4 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.4-alpha-34493';
+$wp_version = '4.4-alpha-34494';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.