scripts.mit.edu
/
autoinstalls
/
wordpress.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
WordPress 3.4.2
[autoinstalls/wordpress.git]
/
wp-admin
/
includes
/
class-wp-plugins-list-table.php
diff --git
a/wp-admin/includes/class-wp-plugins-list-table.php
b/wp-admin/includes/class-wp-plugins-list-table.php
index a1ce53abb5102d6b986fc7f1e2eb3b010c6dfe31..101491ce1c8c1e589b74c92abedc3f21d08e2ab6 100644
(file)
--- a/
wp-admin/includes/class-wp-plugins-list-table.php
+++ b/
wp-admin/includes/class-wp-plugins-list-table.php
@@
-90,7
+90,9
@@
class WP_Plugins_List_Table extends WP_List_Table {
foreach ( (array) $plugins['all'] as $plugin_file => $plugin_data ) {
// Filter into individual sections
foreach ( (array) $plugins['all'] as $plugin_file => $plugin_data ) {
// Filter into individual sections
- if ( ! $screen->is_network && is_plugin_active_for_network( $plugin_file ) ) {
+ if ( is_multisite() && ! $screen->is_network && is_network_only_plugin( $plugin_file ) ) {
+ unset( $plugins['all'][ $plugin_file ] );
+ } elseif ( ! $screen->is_network && is_plugin_active_for_network( $plugin_file ) ) {
unset( $plugins['all'][ $plugin_file ] );
} elseif ( ( ! $screen->is_network && is_plugin_active( $plugin_file ) )
|| ( $screen->is_network && is_plugin_active_for_network( $plugin_file ) ) ) {
unset( $plugins['all'][ $plugin_file ] );
} elseif ( ( ! $screen->is_network && is_plugin_active( $plugin_file ) )
|| ( $screen->is_network && is_plugin_active_for_network( $plugin_file ) ) ) {