Changeset 34551 for trunk/src/wp-admin/includes/class-wp-plugins-list-table.php

Timestamp:

09/25/2015 07:15:08 PM (10 years ago)

Author:

johnbillion

Message:

Implement 'Recently Active' functionality for network-wide plugins in the Network Admin.

Fixes #20468
Thanks to WordCamp RI attendees for testing!

File:

• trunk/src/wp-admin/includes/class-wp-plugins-list-table.php (modified) (3 diffs)

trunk/src/wp-admin/includes/class-wp-plugins-list-table.php

@@ -130 +130 @@
         set_transient( 'plugin_slugs', array_keys( $plugins['all'] ), DAY_IN_SECONDS );
 
-        if ( ! $screen->in_admin( 'network' ) ) {
+        if ( $screen->in_admin( 'network' ) ) {
+            $recently_activated = get_site_option( 'recently_activated', array() );
+        } else {
             $recently_activated = get_option( 'recently_activated', array() );
-
-            foreach ( $recently_activated as $key => $time )
-                if ( $time + WEEK_IN_SECONDS < time() )
-                    unset( $recently_activated[$key] );
+        }
+
+        foreach ( $recently_activated as $key => $time ) {
+            if ( $time + WEEK_IN_SECONDS < time() ) {
+                unset( $recently_activated[$key] );
+            }
+        }
+
+        if ( $screen->in_admin( 'network' ) ) {
+            update_site_option( 'recently_activated', $recently_activated );
+        } else {
             update_option( 'recently_activated', $recently_activated );
         }
@@ -171 +180 @@
                 $plugins['active'][ $plugin_file ] = $plugin_data;
             } else {
-                if ( ! $screen->in_admin( 'network' ) && isset( $recently_activated[ $plugin_file ] ) ) {
-                    // On the non-network screen, populate the recently activated list with plugins that have been recently activated
+                if ( isset( $recently_activated[ $plugin_file ] ) ) {
+                    // Populate the recently activated list with plugins that have been recently activated
                     $plugins['recently_activated'][ $plugin_file ] = $plugin_data;
                 }
@@ -401 +410 @@
         echo '<div class="alignleft actions">';
 
-        if ( ! $this->screen->in_admin( 'network' ) && 'recently_activated' === $status ) {
+        if ( 'recently_activated' == $status ) {
             submit_button( __( 'Clear List' ), 'button', 'clear-recent-list', false );
         } elseif ( 'top' === $which && 'mustuse' === $status ) {