From 15512e1ed88327b07233f01402eca10c1b9664b6 Mon Sep 17 00:00:00 2001 From: Ryan Boren Date: Mon, 10 Mar 2008 17:13:41 +0000 Subject: [PATCH] Fix deletion of plugins not in their own directory. Props DD32. see #5586 git-svn-id: https://develop.svn.wordpress.org/trunk@7209 602fd350-edb4-49c9-b593-d223f7449a82 --- wp-admin/includes/update.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wp-admin/includes/update.php b/wp-admin/includes/update.php index 544673a782..5523252032 100644 --- a/wp-admin/includes/update.php +++ b/wp-admin/includes/update.php @@ -184,7 +184,7 @@ function wp_update_plugin($plugin, $feedback = '') { $plugin_dir = dirname($base . PLUGINDIR . "/$plugin"); $plugin_dir = trailingslashit($plugin_dir); // If plugin is in its own directory, recursively delete the directory. - if ( '.' != $plugin_dir && $base . PLUGINDIR != $plugin_dir ) + if( ! in_array( $plugin_dir, array('.', trailingslashit($base . PLUGINDIR) ) ) ) $deleted = $wp_filesystem->delete($plugin_dir, true); else $deleted = $wp_filesystem->delete($base . PLUGINDIR . "/$plugin");