WordPress.org

Make WordPress Core

Changeset 34494


Ignore:
Timestamp:
09/24/2015 02:19:03 PM (4 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:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/wp-includes/class-wp.php

    r34492 r34494  
    588588     */
    589589    public function handle_404() {
    590         global $wp_query, $wp;
     590        global $wp_query;
    591591
    592592        // If we've already issued a 404, bail.
     
    607607                // check for paged content that exceeds the max number of pages
    608608                $next = '<!--nextpage-->';
    609                 if ( $p && false !== strpos( $p->post_content, $next ) && ! empty( $wp->query_vars['page'] ) ) {
    610                     $page = trim( $wp->query_vars['page'], '/' );
     609                if ( $p && false !== strpos( $p->post_content, $next ) && ! empty( $this->query_vars['page'] ) ) {
     610                    $page = trim( $this->query_vars['page'], '/' );
    611611                    $success = (int) $page <= ( substr_count( $p->post_content, $next ) + 1 );
    612612                }
Note: See TracChangeset for help on using the changeset viewer.