Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2025-01-22 16:21:26 +01:00
Code Issues Projects Releases Wiki Activity

Bootstrap: Use dirname() when loading class-wp-hook.php from plugin.php.

Browse Source 
To allow `plugin.php` to be loaded before the rest of WordPress is loaded, it cannot rely on WordPress constants, such as `ABSPATH` and `WPINC`.

Instead, we can assume that `class-wp-hook.php` will be in the same directory as `plugin.php`, so `dirname( __FILE__ )` will give us the correct path to load from.

Props pento, dd32.
Fixes #37707.


Built from https://develop.svn.wordpress.org/trunk@38589


git-svn-id: http://core.svn.wordpress.org/trunk@38532 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Gary Pendergast 2016-09-12 01:50:30 +00:00
parent 4156988a3c
commit 4dcb7a0fa9
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-includes/plugin.php
View File

@ -22,7 +22,7 @@
*/ */
// Initialize the filter globals. // Initialize the filter globals.
require( ABSPATH . WPINC . '/class-wp-hook.php' ); require( dirname( __FILE__ ) . '/class-wp-hook.php' );
/** @var WP_Hook[] $wp_filter */ /** @var WP_Hook[] $wp_filter */
global $wp_filter, $wp_actions, $wp_current_filter; global $wp_filter, $wp_actions, $wp_current_filter;

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.7-alpha-38588'; $wp_version = '4.7-alpha-38589';
/** /**
* 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.