Changeset 48326

Timestamp:

07/05/2020 08:30:18 PM (4 years ago)

Author:

SergeyBiryukov

Message:

Plugins: Use include_once instead of include in uninstall_plugin(), in case the plugin file is already included.

Props valchovski, pcfreak30.
Fixes #47796.

File:

• trunk/src/wp-admin/includes/plugin.php (modified) (4 diffs)

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

@@ -659 +659 @@
 
         ob_start();
+
+        if ( ! defined( 'WP_SANDBOX_SCRAPING' ) ) {
+            define( 'WP_SANDBOX_SCRAPING', true );
+        }
+
         wp_register_plugin_realpath( WP_PLUGIN_DIR . '/' . $plugin );
         $_wp_plugin_file = $plugin;
-        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.
@@ -1253 +1255 @@
 
         define( 'WP_UNINSTALL_PLUGIN', $file );
+
         wp_register_plugin_realpath( WP_PLUGIN_DIR . '/' . $file );
-        include WP_PLUGIN_DIR . '/' . dirname( $file ) . '/uninstall.php';
+        include_once WP_PLUGIN_DIR . '/' . dirname( $file ) . '/uninstall.php';
 
         return true;
@@ -1266 +1269 @@
 
         wp_register_plugin_realpath( WP_PLUGIN_DIR . '/' . $file );
-        include WP_PLUGIN_DIR . '/' . $file;
+        include_once WP_PLUGIN_DIR . '/' . $file;
 
         add_action( "uninstall_{$file}", $callable );
@@ -2288 +2291 @@
         define( 'WP_SANDBOX_SCRAPING', true );
     }
+
     wp_register_plugin_realpath( WP_PLUGIN_DIR . '/' . $plugin );
     include WP_PLUGIN_DIR . '/' . $plugin;