From 3586ac294f77bd26f23e4cbdebd2a5267675e594 Mon Sep 17 00:00:00 2001
From: Scott Taylor <wonderboymusic@git.wordpress.org>
Date: Fri, 26 Aug 2016 21:10:30 +0000
Subject: [PATCH] Bootstrap: load `option.php` in `wp-settings.php`, not in
 `functions.php`.

See #36335.


git-svn-id: https://develop.svn.wordpress.org/trunk@38386 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-includes/functions.php | 2 --
 src/wp-settings.php           | 1 +
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/wp-includes/functions.php b/src/wp-includes/functions.php
index fa7e725a2f..b956479e45 100644
--- a/src/wp-includes/functions.php
+++ b/src/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/src/wp-settings.php b/src/wp-settings.php
index 111447d4ca..82d2094ae8 100644
--- a/src/wp-settings.php
+++ b/src/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' );