From 09856f3a5cae63b9a5519006dce62b169fc042e4 Mon Sep 17 00:00:00 2001
From: Scott Taylor <wonderboymusic@git.wordpress.org>
Date: Wed, 31 Aug 2016 15:23:57 +0000
Subject: [PATCH] General: revert [38386], `functions.php` was probably too
 tempting for some people to not load by itself.

See #36335.


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

diff --git a/src/wp-includes/functions.php b/src/wp-includes/functions.php
index ca445ec610..90e74e381c 100644
--- a/src/wp-includes/functions.php
+++ b/src/wp-includes/functions.php
@@ -5,6 +5,8 @@
  * @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 93a48be09f..d102daab20 100644
--- a/src/wp-settings.php
+++ b/src/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' );