| 1 | Index: wp-admin/includes/plugin.php |
|---|
| 2 | =================================================================== |
|---|
| 3 | --- wp-admin/includes/plugin.php (revision 23278) |
|---|
| 4 | +++ wp-admin/includes/plugin.php (working copy) |
|---|
| 5 | @@ -859,7 +859,10 @@ |
|---|
| 6 | update_option('uninstall_plugins', $uninstallable_plugins); |
|---|
| 7 | unset($uninstallable_plugins); |
|---|
| 8 | |
|---|
| 9 | - include WP_PLUGIN_DIR . '/' . $file; |
|---|
| 10 | + global $uninstall_plugin_file; |
|---|
| 11 | + $uninstall_plugin_file = WP_PLUGIN_DIR . '/' . $file; |
|---|
| 12 | + include( $uninstall_plugin_file ); |
|---|
| 13 | + unset( $uninstall_plugin_file ); |
|---|
| 14 | |
|---|
| 15 | add_action( 'uninstall_' . $file, $callable ); |
|---|
| 16 | do_action( 'uninstall_' . $file ); |
|---|
| 17 | Index: wp-admin/plugins.php |
|---|
| 18 | =================================================================== |
|---|
| 19 | --- wp-admin/plugins.php (revision 23278) |
|---|
| 20 | +++ wp-admin/plugins.php (working copy) |
|---|
| 21 | @@ -144,7 +144,10 @@ |
|---|
| 22 | @ini_set('display_errors', true); //Ensure that Fatal errors are displayed. |
|---|
| 23 | // Go back to "sandbox" scope so we get the same errors as before |
|---|
| 24 | function plugin_sandbox_scrape( $plugin ) { |
|---|
| 25 | - include( WP_PLUGIN_DIR . '/' . $plugin ); |
|---|
| 26 | + global $activate_plugin_file; |
|---|
| 27 | + $activate_plugin_file = WP_PLUGIN_DIR . '/' . $plugin; |
|---|
| 28 | + include( $activate_plugin_file ); |
|---|
| 29 | + unset( $activate_plugin_file ); |
|---|
| 30 | } |
|---|
| 31 | plugin_sandbox_scrape( $plugin ); |
|---|
| 32 | do_action('activate_' . $plugin); |
|---|