X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/5aa86a9053fb0fa15846bb60aac2fb8fdfff524a..596d585e1dc1eb25bccd3781e37210a4e2504179:/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 577750c9..101491ce 100644
--- a/wp-admin/includes/class-wp-plugins-list-table.php
+++ b/wp-admin/includes/class-wp-plugins-list-table.php
@@ -13,7 +13,7 @@ class WP_Plugins_List_Table extends WP_List_Table {
 		global $status, $page;
 
 		$status = 'all';
-		if ( isset( $_REQUEST['plugin_status'] ) && in_array( $_REQUEST['plugin_status'], array( 'active', 'inactive', 'recently_activated', 'upgrade', 'network', 'mustuse', 'dropins', 'search' ) ) )
+		if ( isset( $_REQUEST['plugin_status'] ) && in_array( $_REQUEST['plugin_status'], array( 'active', 'inactive', 'recently_activated', 'upgrade', 'mustuse', 'dropins', 'search' ) ) )
 			$status = $_REQUEST['plugin_status'];
 
 		if ( isset($_REQUEST['s']) )
@@ -65,32 +65,36 @@ class WP_Plugins_List_Table extends WP_List_Table {
 			if ( apply_filters( 'show_advanced_plugins', true, 'dropins' ) )
 				$plugins['dropins'] = get_dropins();
 
-			$current = get_site_transient( 'update_plugins' );
-			foreach ( (array) $plugins['all'] as $plugin_file => $plugin_data ) {
-				if ( isset( $current->response[ $plugin_file ] ) )
-					$plugins['upgrade'][ $plugin_file ] = $plugin_data;
+			if ( current_user_can( 'update_plugins' ) ) {
+				$current = get_site_transient( 'update_plugins' );
+				foreach ( (array) $plugins['all'] as $plugin_file => $plugin_data ) {
+					if ( isset( $current->response[ $plugin_file ] ) ) {
+						$plugins['all'][ $plugin_file ]['update'] = true;
+						$plugins['upgrade'][ $plugin_file ] = $plugins['all'][ $plugin_file ];
+					}
+				}
 			}
 		}
 
 		set_transient( 'plugin_slugs', array_keys( $plugins['all'] ), 86400 );
 
-		$recently_activated = get_option( 'recently_activated', array() );
+		if ( ! $screen->is_network ) {
+			$recently_activated = get_option( 'recently_activated', array() );
 
-		$one_week = 7*24*60*60;
-		foreach ( $recently_activated as $key => $time )
-			if ( $time + $one_week < time() )
-				unset( $recently_activated[$key] );
-		update_option( 'recently_activated', $recently_activated );
+			$one_week = 7*24*60*60;
+			foreach ( $recently_activated as $key => $time )
+				if ( $time + $one_week < time() )
+					unset( $recently_activated[$key] );
+			update_option( 'recently_activated', $recently_activated );
+		}
 
 		foreach ( (array) $plugins['all'] as $plugin_file => $plugin_data ) {
 			// Filter into individual sections
-			if ( is_multisite() && is_network_only_plugin( $plugin_file ) && !$screen->is_network ) {
-				unset( $plugins['all'][ $plugin_file] );
-			} elseif ( is_plugin_active_for_network($plugin_file) && !$screen->is_network ) {
+			if ( is_multisite() && ! $screen->is_network && is_network_only_plugin( $plugin_file ) ) {
 				unset( $plugins['all'][ $plugin_file ] );
-			} elseif ( is_multisite() && is_network_only_plugin( $plugin_file ) && !current_user_can( 'manage_network_plugins' ) ) {
-				$plugins['network'][ $plugin_file ] = $plugin_data;
-			} elseif ( ( !$screen->is_network && is_plugin_active( $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 ) ) ) {
 				$plugins['active'][ $plugin_file ] = $plugin_data;
 			} else {
@@ -100,9 +104,6 @@ class WP_Plugins_List_Table extends WP_List_Table {
 			}
 		}
 
-		if ( !current_user_can( 'update_plugins' ) )
-			$plugins['upgrade'] = array();
-
 		if ( $s ) {
 			$status = 'search';
 			$plugins['search'] = array_filter( $plugins['all'], array( &$this, '_search_callback' ) );
@@ -214,9 +215,6 @@ class WP_Plugins_List_Table extends WP_List_Table {
 				case 'inactive':
 					$text = _n( 'Inactive <span class="count">(%s)</span>', 'Inactive <span class="count">(%s)</span>', $count );
 					break;
-				case 'network':
-					$text = _n( 'Network <span class="count">(%s)</span>', 'Network <span class="count">(%s)</span>', $count );
-					break;
 				case 'mustuse':
 					$text = _n( 'Must-Use <span class="count">(%s)</span>', 'Must-Use <span class="count">(%s)</span>', $count );
 					break;
@@ -247,13 +245,11 @@ class WP_Plugins_List_Table extends WP_List_Table {
 
 		$screen = get_current_screen();
 
-		if ( 'active' != $status ) {
-			$action = $screen->is_network ? 'network-activate-selected' : 'activate-selected';
-			$actions[ $action ] = __( 'Activate' );
-		}
+		if ( 'active' != $status )
+			$actions['activate-selected'] = $screen->is_network ? __( 'Network Activate' ) : __( 'Activate' );
 
 		if ( 'inactive' != $status && 'recent' != $status )
-			$actions['deactivate-selected'] = __( 'Deactivate' );
+			$actions['deactivate-selected'] = $screen->is_network ? __( 'Network Deactivate' ) : __( 'Deactivate' );
 
 		if ( !is_multisite() || $screen->is_network ) {
 			if ( current_user_can( 'update_plugins' ) )
@@ -282,7 +278,9 @@ class WP_Plugins_List_Table extends WP_List_Table {
 
 		echo '<div class="alignleft actions">';
 
-		if ( 'recently_activated' == $status )
+		$screen = get_current_screen();
+
+		if ( ! $screen->is_network && 'recently_activated' == $status )
 			submit_button( __( 'Clear List' ), 'secondary', 'clear-recent-list', false );
 		elseif ( 'top' == $which && 'mustuse' == $status )
 			echo '<p>' . sprintf( __( 'Files in the <code>%s</code> directory are executed automatically.' ), str_replace( ABSPATH, '/', WPMU_PLUGIN_DIR ) ) . '</p>';
@@ -312,7 +310,7 @@ class WP_Plugins_List_Table extends WP_List_Table {
 	}
 
 	function single_row( $plugin_file, $plugin_data ) {
-		global $status, $page, $s;
+		global $status, $page, $s, $totals;
 
 		$context = $status;
 
@@ -320,9 +318,8 @@ class WP_Plugins_List_Table extends WP_List_Table {
 
 		// preorder
 		$actions = array(
-			'network_deactivate' => '', 'deactivate' => '',
-			'network_only' => '', 'activate' => '',
-			'network_activate' => '',
+			'deactivate' => '',
+			'activate' => '',
 			'edit' => '',
 			'delete' => '',
 		);
@@ -347,22 +344,18 @@ class WP_Plugins_List_Table extends WP_List_Table {
 			if ( $plugin_data['Description'] )
 				$description .= '<p>' . $plugin_data['Description'] . '</p>';
 		} else {
-			$is_active_for_network = is_plugin_active_for_network($plugin_file);
 			if ( $screen->is_network )
-				$is_active = $is_active_for_network;
+				$is_active = is_plugin_active_for_network( $plugin_file );
 			else
 				$is_active = is_plugin_active( $plugin_file );
 
-			if ( $is_active_for_network && !is_super_admin() && !$screen->is_network )
-				return;
-
 			if ( $screen->is_network ) {
-				if ( $is_active_for_network ) {
+				if ( $is_active ) {
 					if ( current_user_can( 'manage_network_plugins' ) )
-						$actions['network_deactivate'] = '<a href="' . wp_nonce_url('plugins.php?action=deactivate&amp;networkwide=1&amp;plugin=' . $plugin_file . '&amp;plugin_status=' . $context . '&amp;paged=' . $page . '&amp;s=' . $s, 'deactivate-plugin_' . $plugin_file) . '" title="' . esc_attr__('Deactivate this plugin') . '">' . __('Network Deactivate') . '</a>';
+						$actions['deactivate'] = '<a href="' . wp_nonce_url('plugins.php?action=deactivate&amp;plugin=' . $plugin_file . '&amp;plugin_status=' . $context . '&amp;paged=' . $page . '&amp;s=' . $s, 'deactivate-plugin_' . $plugin_file) . '" title="' . esc_attr__('Deactivate this plugin') . '">' . __('Network Deactivate') . '</a>';
 				} else {
 					if ( current_user_can( 'manage_network_plugins' ) )
-						$actions['network_activate'] = '<a href="' . wp_nonce_url('plugins.php?action=activate&amp;networkwide=1&amp;plugin=' . $plugin_file . '&amp;plugin_status=' . $context . '&amp;paged=' . $page . '&amp;s=' . $s, 'activate-plugin_' . $plugin_file) . '" title="' . esc_attr__('Activate this plugin for all sites in this network') . '" class="edit">' . __('Network Activate') . '</a>';
+						$actions['activate'] = '<a href="' . wp_nonce_url('plugins.php?action=activate&amp;plugin=' . $plugin_file . '&amp;plugin_status=' . $context . '&amp;paged=' . $page . '&amp;s=' . $s, 'activate-plugin_' . $plugin_file) . '" title="' . esc_attr__('Activate this plugin for all sites in this network') . '" class="edit">' . __('Network Activate') . '</a>';
 					if ( current_user_can( 'delete_plugins' ) && ! is_plugin_active( $plugin_file ) )
 						$actions['delete'] = '<a href="' . wp_nonce_url('plugins.php?action=delete-selected&amp;checked[]=' . $plugin_file . '&amp;plugin_status=' . $context . '&amp;paged=' . $page . '&amp;s=' . $s, 'bulk-plugins') . '" title="' . esc_attr__('Delete this plugin') . '" class="delete">' . __('Delete') . '</a>';
 				}
@@ -394,6 +387,8 @@ class WP_Plugins_List_Table extends WP_List_Table {
 		}
 
 		$id = sanitize_title( $plugin_name );
+		if ( ! empty( $totals['upgrade'] ) && ! empty( $plugin_data['update'] ) )
+			$class .= ' update';
 
 		echo "<tr id='$id' class='$class'>";
 
@@ -448,5 +443,3 @@ class WP_Plugins_List_Table extends WP_List_Table {
 		do_action( "after_plugin_row_$plugin_file", $plugin_file, $plugin_data, $status );
 	}
 }
-
-?>