From b9f516e55edd895e5b2f76a80b90ff5c5ac5e94b Mon Sep 17 00:00:00 2001
From: Scott Taylor <scott.c.taylor@mac.com>
Date: Fri, 26 Aug 2016 21:11:29 +0000
Subject: [PATCH] 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
---
 wp-includes/functions.php | 2 --
 wp-includes/version.php   | 2 +-
 wp-settings.php           | 1 +
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/wp-includes/functions.php b/wp-includes/functions.php
index fa7e725a2f..b956479e45 100644
--- a/wp-includes/functions.php
+++ b/wp-includes/functions.php
@@ -5,8 +5,6 @@
  * @package WordPress
  */
 
-require( ABSPATH . WPINC . '/option.php' );
-
 /**
  * Convert given date string into a different format.
  *
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 63d8a517ec..e82c435824 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @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.
diff --git a/wp-settings.php b/wp-settings.php
index 111447d4ca..82d2094ae8 100644
--- a/wp-settings.php
+++ b/wp-settings.php
@@ -91,6 +91,7 @@ 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 . '/class-wp-matchesmapregex.php' );
 require( ABSPATH . WPINC . '/class-wp.php' );