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
This commit is contained in:
Scott Taylor 2016-08-31 15:23:57 +00:00
parent 683d828d42
commit 09856f3a5c
2 changed files with 2 additions and 1 deletions

View File

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

View File

@ -94,7 +94,6 @@ wp_set_lang_dir();
// Load early WordPress files. // Load early WordPress files.
require( ABSPATH . WPINC . '/compat.php' ); require( ABSPATH . WPINC . '/compat.php' );
require( ABSPATH . WPINC . '/option.php' );
require( ABSPATH . WPINC . '/functions.php' ); require( ABSPATH . WPINC . '/functions.php' );
require( ABSPATH . WPINC . '/pomo/mo.php' ); require( ABSPATH . WPINC . '/pomo/mo.php' );