From c9027b00babeb36a58b233ae290e190beecbd655 Mon Sep 17 00:00:00 2001
From: Jeremy Felt <jeremy.felt@gmail.com>
Date: Tue, 7 Jul 2015 00:02:24 +0000
Subject: [PATCH] Assign proper active class when showing plugin updates in
 network admin

Previously, a plugin would trigger an active class if it was active on the network's main site.

Fixes #32901.

Built from https://develop.svn.wordpress.org/trunk@33100


git-svn-id: http://core.svn.wordpress.org/trunk@33071 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/update.php | 7 ++++++-
 wp-includes/version.php      | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/wp-admin/includes/update.php b/wp-admin/includes/update.php
index 4f6c686431..9bbb0c0f88 100644
--- a/wp-admin/includes/update.php
+++ b/wp-admin/includes/update.php
@@ -315,7 +315,12 @@ function wp_plugin_update_row( $file, $plugin_data ) {
 	$wp_list_table = _get_list_table('WP_Plugins_List_Table');
 
 	if ( is_network_admin() || !is_multisite() ) {
-		$active_class = is_plugin_active( $file ) ? ' active' : '';
+		if ( is_network_admin() ) {
+			$active_class = is_plugin_active_for_network( $file ) ? ' active': '';
+		} else {
+			$active_class = is_plugin_active( $file ) ? ' active' : '';
+		}
+
 		echo '<tr class="plugin-update-tr' . $active_class . '" id="' . esc_attr( $r->slug . '-update' ) . '" data-slug="' . esc_attr( $r->slug ) . '" data-plugin="' . esc_attr( $file ) . '"><td colspan="' . esc_attr( $wp_list_table->get_column_count() ) . '" class="plugin-update colspanchange"><div class="update-message">';
 
 		if ( ! current_user_can( 'update_plugins' ) ) {
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 7b2a076fc9..e4aadca7ff 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.3-beta1-33099';
+$wp_version = '4.3-beta1-33100';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.