Changeset 34551

Timestamp:

09/25/2015 07:15:08 PM (9 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!

Location:

trunk/src/wp-admin

Files:

• includes/class-wp-plugins-list-table.php (modified) (3 diffs)
• plugin-editor.php (modified) (1 diff)
• plugins.php (modified) (5 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 ) {

trunk/src/wp-admin/plugin-editor.php

@@ -72 +72 @@
                 deactivate_plugins($file, true);
 
-            if ( ! is_network_admin() )
+            if ( ! is_network_admin() ) {
                 update_option( 'recently_activated', array( $file => time() ) + (array) get_option( 'recently_activated' ) );
+            } else {
+                update_site_option( 'recently_activated', array( $file => time() ) + (array) get_site_option( 'recently_activated' ) );
+            }
 
             wp_redirect(add_query_arg('_wpnonce', wp_create_nonce('edit-plugin-test_' . $file), "plugin-editor.php?file=$file&liveupdate=1&scrollto=$scrollto&networkwide=" . $network_wide));

trunk/src/wp-admin/plugins.php

@@ -55 +55 @@
                 unset( $recent[ $plugin ] );
                 update_option( 'recently_activated', $recent );
+            } else {
+                $recent = (array) get_site_option( 'recently_activated' );
+                unset( $recent[ $plugin ] );
+                update_site_option( 'recently_activated', $recent );
             }
 
@@ -97 +101 @@
             if ( ! is_network_admin() ) {
                 $recent = (array) get_option('recently_activated' );
-                foreach ( $plugins as $plugin )
-                    unset( $recent[ $plugin ] );
+            } else {
+                $recent = (array) get_site_option('recently_activated' );
+            }
+
+            foreach ( $plugins as $plugin ) {
+                unset( $recent[ $plugin ] );
+            }
+
+            if ( ! is_network_admin() ) {
                 update_option( 'recently_activated', $recent );
+            } else {
+                update_site_option( 'recently_activated', $recent );
             }
 
@@ -166 +179 @@
 
             deactivate_plugins( $plugin, false, is_network_admin() );
-            if ( ! is_network_admin() )
+
+            if ( ! is_network_admin() ) {
                 update_option( 'recently_activated', array( $plugin => time() ) + (array) get_option( 'recently_activated' ) );
+            } else {
+                update_site_option( 'recently_activated', array( $plugin => time() ) + (array) get_site_option( 'recently_activated' ) );
+            }
+
             if ( headers_sent() )
                 echo "<meta http-equiv='refresh' content='" . esc_attr( "0;url=plugins.php?deactivate=true&plugin_status=$status&paged=$page&s=$s" ) . "' />";
@@ -195 +213 @@
             deactivate_plugins( $plugins, false, is_network_admin() );
 
+            $deactivated = array();
+            foreach ( $plugins as $plugin ) {
+                $deactivated[ $plugin ] = time();
+            }
+
             if ( ! is_network_admin() ) {
-                $deactivated = array();
-                foreach ( $plugins as $plugin )
-                    $deactivated[ $plugin ] = time();
                 update_option( 'recently_activated', $deactivated + (array) get_option( 'recently_activated' ) );
+            } else {
+                update_site_option( 'recently_activated', $deactivated + (array) get_site_option( 'recently_activated' ) );
             }
 
@@ -355 +377 @@
 
         case 'clear-recent-list':
-            if ( ! is_network_admin() )
+            if ( ! is_network_admin() ) {
                 update_option( 'recently_activated', array() );
+            } else {
+                update_site_option( 'recently_activated', array() );
+            }
             break;
     }