summaryrefslogtreecommitdiffstats
path: root/wp-inst/wp-admin/plugins.php
diff options
context:
space:
mode:
authordonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2005-10-07 10:02:56 +0000
committerdonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2005-10-07 10:02:56 +0000
commit5584a91c999f3f708639a579aad4a808007f1de6 (patch)
tree0130a521e5f67ada2921e4742c54756a53d68988 /wp-inst/wp-admin/plugins.php
parent633224fd2366631e618e15f91eedb468ba9fa98d (diff)
downloadwordpress-mu-5584a91c999f3f708639a579aad4a808007f1de6.tar.gz
wordpress-mu-5584a91c999f3f708639a579aad4a808007f1de6.tar.xz
wordpress-mu-5584a91c999f3f708639a579aad4a808007f1de6.zip
WordPress Merge - image deletion and more
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@389 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-inst/wp-admin/plugins.php')
-rw-r--r--wp-inst/wp-admin/plugins.php7
1 files changed, 5 insertions, 2 deletions
diff --git a/wp-inst/wp-admin/plugins.php b/wp-inst/wp-admin/plugins.php
index 25dbd30..d16ae10 100644
--- a/wp-inst/wp-admin/plugins.php
+++ b/wp-inst/wp-admin/plugins.php
@@ -50,8 +50,11 @@ if ( !is_array($check_plugins) ) {
foreach ($check_plugins as $check_plugin) {
if (!file_exists(ABSPATH . 'wp-content/plugins/' . $check_plugin)) {
$current = get_settings('active_plugins');
- unset($current[$_GET['plugin']]);
- update_option('active_plugins', $current);
+ $key = array_search($check_plugin, $current);
+ if ( false !== $key && NULL !== $key ) {
+ unset($current[$key]);
+ update_option('active_plugins', $current);
+ }
}
}
?>