Ticket #8781: 8781.patch

wp-admin/includes/dashboard.php

@@ -708 +708 @@
         $new     = @fetch_rss( 'http://wordpress.org/extend/plugins/rss/browse/new/' );
         $updated = @fetch_rss( 'http://wordpress.org/extend/plugins/rss/browse/updated/' );
 
+        $all_plugins = get_plugins();
+
         foreach ( array( 'popular' => __('Most Popular'), 'new' => __('Newest Plugins'), 'updated' => __('Recently Updated') ) as $feed => $label ) {
                 if ( !isset($$feed->items) || 0 == count($$feed->items) )
                         continue;
 
                 $$feed->items = array_slice($$feed->items, 0, 5);
-                $item_key = array_rand($$feed->items);
 
+                // Pick a random, non-installed plugin
+                $loop = true;
+                while ( true == $loop ) {
+                        $item_key = array_rand($$feed->items);
+                        $item = $$feed->items[$item_key];
+
+                        list($link, $frag) = explode( '#', $item['link'] );
+
+                        $link = clean_url($link);
+                        if( preg_match('|/([^/]+?)/?$|', $link, $matches) )
+                                $slug = $matches[1];
+                        else
+                                $slug = '';
+
+                        // Loop through all plugins on this WordPress install looking for the random plugin
+                        foreach ( $all_plugins as $all_plugin_slug => $all_plugin ) {
+                                if ( $slug == substr( $all_plugin_slug, 0, strlen( $slug ) ) ) {
+                                        // This random plugin is installed. Remove it and try again.
+                                        unset( $$feed->items[$item_key] );
+                                        continue 2;
+                                }
+                        }
+
+                        // We can stop looping as this random plugin isn't installed
+                        $loop = false;
+                }
+
                 // Eliminate some common badly formed plugin descriptions
                 while ( ( null !== $item_key = array_rand($$feed->items) ) && false !== strpos( $$feed->items[$item_key]['description'], 'Plugin Name:' ) )
                         unset($$feed->items[$item_key]);
@@ -722 +750 @@
                 if ( !isset($$feed->items[$item_key]) )
                         continue;
 
-                $item = $$feed->items[$item_key];
-
                 // current bbPress feed item titles are: user on "topic title"
                 if ( preg_match( '/"(.*)"/s', $item['title'], $matches ) )
                         $title = $matches[1];
@@ -733 +759 @@
 
                 $description = wp_specialchars( strip_tags(html_entity_decode($item['description'], ENT_QUOTES)) );
 
-                list($link, $frag) = explode( '#', $item['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) .
                                                         '&TB_iframe=true&width=600&height=800';