WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Scott Taylor 2015-09-24 14:20:24 +00:00
parent fbb6ef1922
commit b45178379b
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wp-includes/class-wp.php
View File

@ -587,7 +587,7 @@ class WP {
* @global WP_Query $wp_query * @global WP_Query $wp_query
*/ */
public function handle_404() { public function handle_404() {
global $wp_query, $wp; global $wp_query;
// If we've already issued a 404, bail. // If we've already issued a 404, bail.
if ( is_404() ) if ( is_404() )
@ -606,8 +606,8 @@ class WP {
// check for paged content that exceeds the max number of pages // check for paged content that exceeds the max number of pages
$next = '<!--nextpage-->'; $next = '<!--nextpage-->';
if ( $p && false !== strpos( $p->post_content, $next ) && ! empty( $wp->query_vars['page'] ) ) { if ( $p && false !== strpos( $p->post_content, $next ) && ! empty( $this->query_vars['page'] ) ) {
$page = trim( $wp->query_vars['page'], '/' ); $page = trim( $this->query_vars['page'], '/' );
$success = (int) $page <= ( substr_count( $p->post_content, $next ) + 1 ); $success = (int) $page <= ( substr_count( $p->post_content, $next ) + 1 );
} }
} }

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @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. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.