Changeset 7209

Show
Ignore:
Timestamp:
03/10/08 17:13:41 (6 months ago)
Author:
ryan
Message:

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

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/wp-admin/includes/update.php

    r7205 r7209  
    185185    $plugin_dir = trailingslashit($plugin_dir); 
    186186    // If plugin is in its own directory, recursively delete the directory. 
    187     if ( '.' != $plugin_dir && $base . PLUGINDIR != $plugin_dir ) 
     187    if( ! in_array( $plugin_dir, array('.', trailingslashit($base . PLUGINDIR) ) ) ) 
    188188        $deleted = $wp_filesystem->delete($plugin_dir, true); 
    189189    else