sergiotarxz
/
Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use a separate variable to fix plugin deletion. props phill_brown, fixes #15940. 

git-svn-id: https://develop.svn.wordpress.org/trunk@17106 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Andrew Nacin 2010-12-21 23:18:10 +00:00
parent 8109449e0b
commit 71b6aeb04d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-admin/plugins.php
View File

@ -234,8 +234,8 @@ if ( $action ) {
$files_to_delete = array_merge($files_to_delete, $files); $files_to_delete = array_merge($files_to_delete, $files);
} }
// Get plugins list from that folder // Get plugins list from that folder
if ( $plugins['folder'] = get_plugins( '/' . dirname($plugin)) ) { if ( $folder_plugins = get_plugins( '/' . dirname($plugin)) ) {
foreach( $plugins['folder'] as $plugin_file => $data ) { foreach( $folder_plugins as $plugin_file => $data ) {
$plugin_info[ $plugin_file ] = _get_plugin_data_markup_translate( $plugin_file, $data ); $plugin_info[ $plugin_file ] = _get_plugin_data_markup_translate( $plugin_file, $data );
$plugin_info[ $plugin_file ]['is_uninstallable'] = is_uninstallable_plugin( $plugin ); $plugin_info[ $plugin_file ]['is_uninstallable'] = is_uninstallable_plugin( $plugin );
if ( ! $plugin_info[ $plugin_file ]['Network'] ) if ( ! $plugin_info[ $plugin_file ]['Network'] )