Bootstrap: load `option.php` in `wp-settings.php`, not in `functions.php`.
See #36335. Built from https://develop.svn.wordpress.org/trunk@38386 git-svn-id: http://core.svn.wordpress.org/trunk@38327 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
9e1542b9ec
commit
b9f516e55e
|
@ -5,8 +5,6 @@
|
||||||
* @package WordPress
|
* @package WordPress
|
||||||
*/
|
*/
|
||||||
|
|
||||||
require( ABSPATH . WPINC . '/option.php' );
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Convert given date string into a different format.
|
* Convert given date string into a different format.
|
||||||
*
|
*
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
*
|
*
|
||||||
* @global string $wp_version
|
* @global string $wp_version
|
||||||
*/
|
*/
|
||||||
$wp_version = '4.7-alpha-38385';
|
$wp_version = '4.7-alpha-38386';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 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.
|
||||||
|
|
|
@ -91,6 +91,7 @@ wp_set_lang_dir();
|
||||||
|
|
||||||
// Load early WordPress files.
|
// Load early WordPress files.
|
||||||
require( ABSPATH . WPINC . '/compat.php' );
|
require( ABSPATH . WPINC . '/compat.php' );
|
||||||
|
require( ABSPATH . WPINC . '/option.php' );
|
||||||
require( ABSPATH . WPINC . '/functions.php' );
|
require( ABSPATH . WPINC . '/functions.php' );
|
||||||
require( ABSPATH . WPINC . '/class-wp-matchesmapregex.php' );
|
require( ABSPATH . WPINC . '/class-wp-matchesmapregex.php' );
|
||||||
require( ABSPATH . WPINC . '/class-wp.php' );
|
require( ABSPATH . WPINC . '/class-wp.php' );
|
||||||
|
|
Loading…
Reference in New Issue