Changeset 45116

Timestamp:

04/05/2019 03:52:39 PM (4 years ago)

Author:

flixos90

Message:

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

See #46045.

Location:

trunk/src

Files:

• wp-admin/includes/plugin.php (modified) (2 diffs)
• wp-admin/includes/theme.php (modified) (1 diff)
• wp-includes/load.php (modified) (1 diff)

trunk/src/wp-admin/includes/plugin.php

@@ -636 +636 @@
         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.
@@ -2133 +2135 @@
  */
 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 );

trunk/src/wp-admin/includes/theme.php

@@ -860 +860 @@
             // 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();

trunk/src/wp-includes/load.php

@@ -1445 +1445 @@
         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 );
 }