Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-07-01 01:05:06 +02:00
Code Issues Projects Releases Wiki Activity

Plugins: When loading a plugin in a "sandbox" on activation, do it once.

Browse Source 
This avoids a fatal error if the plugin is already included, e.g. in unit tests.

Follow-up to [50787].

See #31104.
Built from https://develop.svn.wordpress.org/trunk@50788


git-svn-id: http://core.svn.wordpress.org/trunk@50397 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2021-04-25 13:21:05 +00:00
parent fe549286d5
commit 1ad7538792
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-admin/includes/plugin.php
View File

@ -2292,7 +2292,7 @@ function plugin_sandbox_scrape( $plugin ) {
}
wp_register_plugin_realpath( WP_PLUGIN_DIR . '/' . $plugin );
include WP_PLUGIN_DIR . '/' . $plugin;
include_once WP_PLUGIN_DIR . '/' . $plugin;
}
/**

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
*
* @global string $wp_version
*/
$wp_version = '5.8-alpha-50787';
$wp_version = '5.8-alpha-50788';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.