sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
See #46045.


git-svn-id: https://develop.svn.wordpress.org/trunk@45116 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Felix Arntz 2019-04-05 15:52:39 +00:00
parent dca58d725e
commit 075a85c05e
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/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
src/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
src/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 );
}