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

Bootstrap/Load: Do not redefine constants because tests don't like it. 

See #46045.

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


git-svn-id: http://core.svn.wordpress.org/trunk@44925 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Felix Arntz 2019-04-05 15:53:50 +00:00
parent 5d2c761568
commit 52354f3f0b
4 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -635,7 +635,9 @@ function activate_plugin( $plugin, $redirect = '', $network_wide = false, $silen
ob_start();
wp_register_plugin_realpath( WP_PLUGIN_DIR . '/' . $plugin );
$_wp_plugin_file = $plugin;
define( 'WP_SANDBOX_SCRAPING', true );
if ( ! defined( 'WP_SANDBOX_SCRAPING' ) ) {
define( 'WP_SANDBOX_SCRAPING', true );
}
include_once( WP_PLUGIN_DIR . '/' . $plugin );
$plugin = $_wp_plugin_file; // Avoid stomping of the $plugin variable in a plugin.
@ -2132,7 +2134,9 @@ function wp_clean_plugins_cache( $clear_update_cache = true ) {
* @param string $plugin Path to the plugin file relative to the plugins directory.
*/
function plugin_sandbox_scrape( $plugin ) {
define( 'WP_SANDBOX_SCRAPING', true );
if ( ! defined( 'WP_SANDBOX_SCRAPING' ) ) {
define( 'WP_SANDBOX_SCRAPING', true );
}
wp_register_plugin_realpath( WP_PLUGIN_DIR . '/' . $plugin );
include( WP_PLUGIN_DIR . '/' . $plugin );
}

4
wp-admin/includes/theme.php
View File

@ -859,7 +859,9 @@ function resume_theme( $theme, $redirect = '' ) {
// Load the theme's functions.php to test whether it throws a fatal error.
ob_start();
define( 'WP_SANDBOX_SCRAPING', true );
if ( ! defined( 'WP_SANDBOX_SCRAPING' ) ) {
define( 'WP_SANDBOX_SCRAPING', true );
}
include $functions_path;
ob_clean();
}

4
wp-includes/load.php
View File

@ -1444,7 +1444,9 @@ function wp_start_scraping_edited_file_errors() {
echo "###### wp_scraping_result_end:$key ######";
die();
}
define( 'WP_SANDBOX_SCRAPING', true );
if ( ! defined( 'WP_SANDBOX_SCRAPING' ) ) {
define( 'WP_SANDBOX_SCRAPING', true );
}
register_shutdown_function( 'wp_finalize_scraping_edited_file_errors', $key );
}

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
*
* @global string $wp_version
*/
$wp_version = '5.2-beta1-45115';
$wp_version = '5.2-beta1-45116';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.