From a11d2f6a761d2c7a5c0c18d80d599105f34bf0cb Mon Sep 17 00:00:00 2001 From: Felix Arntz Date: Fri, 27 Apr 2018 11:37:21 +0000 Subject: [PATCH] Bootstrap: Load `class-wp-meta-query.php` earlier in `wp-settings.php`. This change is necessary to enable multisite-specific meta query functionality during the multisite bootstrap process. Fixes #40948. See #40229. Built from https://develop.svn.wordpress.org/trunk@43009 git-svn-id: http://core.svn.wordpress.org/trunk@42838 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/version.php | 2 +- wp-settings.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/wp-includes/version.php b/wp-includes/version.php index de1e85c53d..c8a0d94d9e 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '5.0-alpha-43008'; +$wp_version = '5.0-alpha-43009'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. diff --git a/wp-settings.php b/wp-settings.php index 6b1f32bbff..eb632238f0 100644 --- a/wp-settings.php +++ b/wp-settings.php @@ -98,6 +98,7 @@ require( ABSPATH . WPINC . '/class-wp-list-util.php' ); require( ABSPATH . WPINC . '/formatting.php' ); require( ABSPATH . WPINC . '/meta.php' ); require( ABSPATH . WPINC . '/functions.php' ); +require( ABSPATH . WPINC . '/class-wp-meta-query.php' ); require( ABSPATH . WPINC . '/class-wp-matchesmapregex.php' ); require( ABSPATH . WPINC . '/class-wp.php' ); require( ABSPATH . WPINC . '/class-wp-error.php' ); @@ -159,7 +160,6 @@ require( ABSPATH . WPINC . '/user.php' ); require( ABSPATH . WPINC . '/class-wp-user-query.php' ); require( ABSPATH . WPINC . '/class-wp-session-tokens.php' ); require( ABSPATH . WPINC . '/class-wp-user-meta-session-tokens.php' ); -require( ABSPATH . WPINC . '/class-wp-meta-query.php' ); require( ABSPATH . WPINC . '/class-wp-metadata-lazyloader.php' ); require( ABSPATH . WPINC . '/general-template.php' ); require( ABSPATH . WPINC . '/link-template.php' );