Changeset 7209

Timestamp:

03/10/2008 05:13:41 PM (13 years ago)

Author:

ryan

Message:

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

File:

• trunk/wp-admin/includes/update.php (modified) (1 diff)

trunk/wp-admin/includes/update.php

@@ -185 +185 @@
     $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