WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

git-svn-id: http://svn.automattic.com/wordpress/trunk@17106 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
nacin 2010-12-21 23:18:10 +00:00
parent 8efc94bbeb
commit 58af295c54
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);
}
// Get plugins list from that folder
if ( $plugins['folder'] = get_plugins( '/' . dirname($plugin)) ) {
foreach( $plugins['folder'] as $plugin_file => $data ) {
if ( $folder_plugins = get_plugins( '/' . dirname($plugin)) ) {
foreach( $folder_plugins as $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 );
if ( ! $plugin_info[ $plugin_file ]['Network'] )