sergiotarxz
/
Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
This commit is contained in:
Scott Taylor 2015-09-24 14:19:03 +00:00
parent 6ac2cb05e6
commit 30554cccab
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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 );
}
}