Changeset 10738

Timestamp:

03/07/2009 02:07:24 AM (16 years ago)

Author:

ryan

Message:

Don't show already installed plugins in the Plugins dashboard widget. Props Viper007Bond. fixes #8781

Location:

trunk/wp-admin

Files:

• includes/dashboard.php (modified) (4 diffs)
• plugins.php (modified) (1 diff)

trunk/wp-admin/includes/dashboard.php

@@ -735 +735 @@
     $updated = fetch_feed( 'http://wordpress.org/extend/plugins/rss/browse/updated/' );
 
+    if ( false === $plugin_slugs = get_transient( 'plugin_slugs' ) ) {
+        $plugin_slugs = array_keys( get_plugins() );
+        set_transient( 'plugin_slugs', $plugin_slugs, 86400 );
+    }
+
     foreach ( array( 'popular' => __('Most Popular'), 'new' => __('Newest Plugins'), 'updated' => __('Recently Updated') ) as $feed => $label ) {
         if ( !$$feed->get_item_quantity() )
@@ -740 +745 @@
 
         $items = $$feed->get_items(0, 5);
-        $item_key = array_rand($items);
+
+        // Pick a random, non-installed plugin
+        while ( true ) {
+            // Abort this foreach loop iteration if there's no plugins left of this type
+            if ( 0 == count($items) )
+                continue 2;
+
+            $item_key = array_rand($items);
+            $item = $items[$item_key];
+
+            list($link, $frag) = explode( '#', $item->get_link() );
+
+            $link = clean_url($link);
+            if ( preg_match( '|/([^/]+?)/?$|', $link, $matches ) )
+                $slug = $matches[1];
+            else {
+                unset( $items[$item_key] );
+                continue;
+            }
+
+            // Is this random plugin's slug already installed? If so, try again.
+            reset( $plugin_slugs );
+            foreach ( $plugin_slugs as $plugin_slug ) {
+                if ( $slug == substr( $plugin_slug, 0, strlen( $slug ) ) ) {
+                    unset( $items[$item_key] );
+                    continue 2;
+                }
+            }
+
+            // If we get to this point, then the random plugin isn't installed and we can stop the while().
+            break;
+        }
 
         // Eliminate some common badly formed plugin descriptions
@@ -748 +784 @@
         if ( !isset($items[$item_key]) )
             continue;
-
-        $item = $items[$item_key];
 
         // current bbPress feed item titles are: user on "topic title"
@@ -759 +793 @@
 
         $description = wp_specialchars( strip_tags(html_entity_decode($item->get_description(), ENT_QUOTES, get_option('blog_charset'))) );
-
-        list($link, $frag) = explode( '#', $item->get_link() );
-
-        $link = clean_url($link);
-        if( preg_match('|/([^/]+?)/?$|', $link, $matches) )
-            $slug = $matches[1];
-        else
-            $slug = '';
 
         $ilink = wp_nonce_url('plugin-install.php?tab=plugin-information&plugin=' . $slug, 'install-plugin_' . $slug) .

trunk/wp-admin/plugins.php

@@ -213 +213 @@
 $recent_plugins = array();
 $recently_activated = (array) get_option('recently_activated');
-
-//Clean out any plugins which were deactivated over a week ago.
+set_transient( 'plugin_slugs', array_keys($all_plugins), 86400 );
+
+// Clean out any plugins which were deactivated over a week ago.
 foreach ( $recently_activated as $key => $time )
     if ( $time + (7*24*60*60) < time() ) //1 week