WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Scott Taylor 2016-08-31 15:24:29 +00:00
parent 0eebbed6b2
commit 7e8d7f8a81
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-includes/functions.php
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.
* *

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @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. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.

1
wp-settings.php
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' );