Changeset 38386

Timestamp:

08/26/2016 09:10:30 PM (8 years ago)

Author:

wonderboymusic

Message:

Bootstrap: load option.php in wp-settings.php, not in functions.php.

See #36335.

Location:

trunk/src

Files:

• wp-includes/functions.php (modified) (1 diff)
• wp-settings.php (modified) (1 diff)

trunk/src/wp-includes/functions.php

@@ -5 +5 @@
  * @package WordPress
  */
-
-require( ABSPATH . WPINC . '/option.php' );
 
 /**

trunk/src/wp-settings.php

@@ -92 +92 @@
 // Load early WordPress files.
 require( ABSPATH . WPINC . '/compat.php' );
+require( ABSPATH . WPINC . '/option.php' );
 require( ABSPATH . WPINC . '/functions.php' );
 require( ABSPATH . WPINC . '/class-wp-matchesmapregex.php' );