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

Plugin Editor: Revert superseded changes to activate_plugin() and plugin_sandbox_scrape().

Browse Source 
Partially revert [41671], [41561], [41560].
See #21622.
Fixes #39766.

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


git-svn-id: http://core.svn.wordpress.org/trunk@41653 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Weston Ruter 2017-10-11 00:03:48 +00:00
parent 80fd3cad0d
commit 3609d0c4c5
2 changed files with 7 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
wp-admin/includes/plugin.php
View File

@ -563,8 +563,10 @@ function activate_plugin( $plugin, $redirect = '', $network_wide = false, $silen
if ( !empty($redirect) )
wp_redirect(add_query_arg('_error_nonce', wp_create_nonce('plugin-activation-error_' . $plugin), $redirect)); // we'll override this later if the plugin can be included without fatal error
ob_start();
plugin_sandbox_scrape( $plugin );
wp_register_plugin_realpath( WP_PLUGIN_DIR . '/' . $plugin );
$_wp_plugin_file = $plugin;
include_once( WP_PLUGIN_DIR . '/' . $plugin );
$plugin = $_wp_plugin_file; // Avoid stomping of the $plugin variable in a plugin.
if ( ! $silent ) {
/**
@ -1896,41 +1898,14 @@ function wp_clean_plugins_cache( $clear_update_cache = true ) {
}
/**
* Simulate loading the WordPress admin with a given plugin active to attempt to generate errors.
*
* Actions are re-triggered in the WP bootstrap process for the WP Admin, and the WP_ADMIN constant is defined.
* Load a given plugin attempt to generate errors.
*
* @since 3.0.0
* @since 4.4.0 Function was moved into the `wp-admin/includes/plugin.php` file.
* @since 4.9.0 Add defining of WP_ADMIN and triggering admin WP bootstrap actions.
*
* @global array $wp_actions
* @param string $plugin Plugin file to load.
*/
function plugin_sandbox_scrape( $plugin ) {
global $wp_actions;
wp_register_plugin_realpath( WP_PLUGIN_DIR . '/' . $plugin );
if ( ! defined( 'WP_ADMIN' ) ) {
define( 'WP_ADMIN', true );
}
$tested_actions = array(
'setup_theme' => array(),
'after_setup_theme' => array(),
'init' => array(),
'wp_loaded' => array(),
'admin_init' => array(),
);
$old_wp_actions = $wp_actions;
array_map( 'remove_all_actions', array_keys( $tested_actions ) );
include_once( WP_PLUGIN_DIR . '/' . $plugin );
// Trigger key actions that are done on the plugin editor to cause the relevant plugin hooks to fire and potentially cause errors.
foreach ( $tested_actions as $action => $args ) {
do_action_ref_array( $action, $args );
}
$wp_actions = $old_wp_actions; // Restore actions.
include( WP_PLUGIN_DIR . '/' . $plugin );
}

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.9-beta1-41818';
$wp_version = '4.9-beta1-41819';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.