Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2025-02-23 07:51:49 +01:00
Code Issues Projects Releases Wiki Activity

Fix deletion of plugins not in their own directory. Props DD32. see #5586

Browse Source 
git-svn-id: http://svn.automattic.com/wordpress/trunk@7209 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2008-03-10 17:13:41 +00:00
parent 8768a5eed8
commit 5fa2304d1e
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-admin/includes/update.php
View File

@ -184,7 +184,7 @@ function wp_update_plugin($plugin, $feedback = '') {
$plugin_dir = dirname($base . PLUGINDIR . "/$plugin"); $plugin_dir = dirname($base . PLUGINDIR . "/$plugin");
$plugin_dir = trailingslashit($plugin_dir); $plugin_dir = trailingslashit($plugin_dir);
// If plugin is in its own directory, recursively delete the directory. // 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); $deleted = $wp_filesystem->delete($plugin_dir, true);
else else
$deleted = $wp_filesystem->delete($base . PLUGINDIR . "/$plugin"); $deleted = $wp_filesystem->delete($base . PLUGINDIR . "/$plugin");