Index: wp-admin/includes/plugin.php
===================================================================
--- wp-admin/includes/plugin.php	(revision 23278)
+++ wp-admin/includes/plugin.php	(working copy)
@@ -859,7 +859,10 @@
 		update_option('uninstall_plugins', $uninstallable_plugins);
 		unset($uninstallable_plugins);
 
-		include WP_PLUGIN_DIR . '/' . $file;
+    global $uninstall_plugin_file;
+    $uninstall_plugin_file = WP_PLUGIN_DIR . '/' . $file;
+    include( $uninstall_plugin_file );
+    unset( $uninstall_plugin_file );
 
 		add_action( 'uninstall_' . $file, $callable );
 		do_action( 'uninstall_' . $file );
Index: wp-admin/plugins.php
===================================================================
--- wp-admin/plugins.php	(revision 23278)
+++ wp-admin/plugins.php	(working copy)
@@ -144,7 +144,10 @@
 			@ini_set('display_errors', true); //Ensure that Fatal errors are displayed.
 			// Go back to "sandbox" scope so we get the same errors as before
 			function plugin_sandbox_scrape( $plugin ) {
-				include( WP_PLUGIN_DIR . '/' . $plugin );
+        global $activate_plugin_file;
+        $activate_plugin_file = WP_PLUGIN_DIR . '/' . $plugin;
+				include( $activate_plugin_file );
+				unset( $activate_plugin_file );
 			}
 			plugin_sandbox_scrape( $plugin );
 			do_action('activate_' . $plugin);