Changeset 38469

Timestamp:

08/31/2016 03:23:57 PM (8 years ago)

Author:

wonderboymusic

Message:

General: revert [38386], functions.php was probably too tempting for some people to not load by itself.

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

@@ -95 +95 @@
 // Load early WordPress files.
 require( ABSPATH . WPINC . '/compat.php' );
-require( ABSPATH . WPINC . '/option.php' );
 require( ABSPATH . WPINC . '/functions.php' );
 require( ABSPATH . WPINC . '/pomo/mo.php' );