golem
/
twentyGOLEM
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove debug cruft from [17590]. See #14182 

git-svn-id: http://svn.automattic.com/wordpress/trunk@17591 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
dd32 2011-04-03 11:55:27 +00:00
parent 479e64c170
commit 65db854b9f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wp-admin/includes/class-wp-upgrader.php
View File

@ -566,7 +566,7 @@ class Plugin_Upgrader extends WP_Upgrader {
//Hooked to upgrade_clear_destination
function delete_old_plugin($removed, $local_destination, $remote_destination, $plugin) {
global $wp_filesystem;
var_dump("delete_old_plugin($removed, $local_destination, $remote_destination, $plugin)");
if ( is_wp_error($removed) )
return $removed; //Pass errors through.
@ -576,7 +576,7 @@ var_dump("delete_old_plugin($removed, $local_destination, $remote_destination, $
$plugins_dir = $wp_filesystem->wp_plugins_dir();
$this_plugin_dir = trailingslashit( dirname($plugins_dir . $plugin) );
var_dump(compact('plugins_dir', 'this_plugin_dir'), array('exists'=> $wp_filesystem->exists($this_plugin_dir)) );
if ( ! $wp_filesystem->exists($this_plugin_dir) ) //If its already vanished.
return $removed;
@ -585,7 +585,7 @@ var_dump(compact('plugins_dir', 'this_plugin_dir'), array('exists'=> $wp_filesy
$deleted = $wp_filesystem->delete($this_plugin_dir, true);
else
$deleted = $wp_filesystem->delete($plugins_dir . $plugin);
var_dump($deleted);
if ( ! $deleted )
return new WP_Error('remove_old_failed', $this->strings['remove_old_failed']);