Changeset 34494

Timestamp:

09/24/2015 02:19:03 PM (10 years ago)

Author:

wonderboymusic

Message:

After [34492], no need to import the global instance when we are, in fact, currently, that instance.

See #11694.

File:

• trunk/src/wp-includes/class-wp.php (modified) (2 diffs)

trunk/src/wp-includes/class-wp.php

@@ -588 +588 @@
      */
     public function handle_404() {
-        global $wp_query, $wp;
+        global $wp_query;
 
         // If we've already issued a 404, bail.
@@ -607 +607 @@
                 // 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 );
                 }