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

See #36335.

Built from https://develop.svn.wordpress.org/trunk@38469


git-svn-id: http://core.svn.wordpress.org/trunk@38410 1a063a9b-81f0-0310-95a4-ce76da25c4cd

wp-includes/functions.php

@@ -5,6 +5,8 @@
  * @package WordPress
  */
 
+require( ABSPATH . WPINC . '/option.php' );
+
 /**
  * Convert given date string into a different format.
  *

wp-includes/version.php

@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.7-alpha-38468';
+$wp_version = '4.7-alpha-38469';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.

wp-settings.php

@@ -94,7 +94,6 @@ wp_set_lang_dir();
 
 // 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' );