Ticket #8781: 8781.4.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/' );
 
+        $plugin_slugs = get_option( 'plugin_slugs' );
+        if ( !is_array($plugin_slugs) ) {
+                $all_plugins = get_plugins();
+                $plugin_slugs = array();
+                foreach ( $all_plugins as $slug => $plugin )
+                        $plugin_slugs[] = $slug;
+                update_option( 'plugin_slugs', $plugin_slugs );
+        }
+
         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
+                unset( $item );
+                while ( empty($item) ) {
+                        // Abort entirely if there's no items left for this part
+                        if ( 0 == count($$feed->items) )
+                                continue 2;
+
+                        $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 = '';
+
+                        // Check to see if this random plugin is already installed. If so, try a different one.
+                        reset( $plugin_slugs );
+                        foreach ( $plugin_slugs as $plugin_slug ) {
+                                if ( $slug == substr( $plugin_slug, 0, strlen( $slug ) ) ) {
+                                        unset( $item, $$feed->items[$item_key] );
+                                        continue 2;
+                                }
+                        }
+
+                        // We can stop looping as this random plugin isn't installed
+                        break;
+                }
+
                 // 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 +761 @@
                 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 +770 @@
 
                 $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';
 

wp-admin/includes/schema.php

@@ -302 +302 @@
         add_option('update_core', array());
         add_option('dismissed_update_core', array());
 
+        // 2.7.1
+        add_option('plugin_slugs', '', '', 'no');
+
         // Delete unused options
         $unusedoptions = array ('blodotgsping_url', 'bodyterminator', 'emailtestonly', 'phoneemail_separator', 'smilies_directory', 'subjectprefix', 'use_bbcode', 'use_blodotgsping', 'use_phoneemail', 'use_quicktags', 'use_weblogsping', 'weblogs_cache_file', 'use_preview', 'use_htmltrans', 'smilies_directory', 'fileupload_allowedusers', 'use_phoneemail', 'default_post_status', 'default_post_category', 'archive_mode', 'time_difference', 'links_minadminlevel', 'links_use_adminlevels', 'links_rating_type', 'links_rating_char', 'links_rating_ignore_zero', 'links_rating_single_image', 'links_rating_image0', 'links_rating_image1', 'links_rating_image2', 'links_rating_image3', 'links_rating_image4', 'links_rating_image5', 'links_rating_image6', 'links_rating_image7', 'links_rating_image8', 'links_rating_image9', 'weblogs_cacheminutes', 'comment_allowed_tags', 'search_engine_friendly_urls', 'default_geourl_lat', 'default_geourl_lon', 'use_default_geourl', 'weblogs_xml_url', 'new_users_can_blog', '_wpnonce', '_wp_http_referer', 'Update', 'action', 'rich_editing', 'autosave_interval', 'deactivated_plugins');
         foreach ($unusedoptions as $option) :

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.
+// Update the slug cache
+$plugin_slugs = array();
+foreach ( $plugin_slugs as $slug => $plugin )
+        $plugin_slugs[] = $slug;
+update_option( 'plugin_slugs', $plugin_slugs );
+
+// 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
                 unset($recently_activated[ $key ]);