Changeset 34551 for trunk/src/wp-admin/plugins.php

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!

File:

• trunk/src/wp-admin/plugins.php (modified) (5 diffs)

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;
     }