Changeset 3530 for sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-tools.php

Timestamp:

06/22/2016 09:32:21 AM (10 years ago)

Author:

dd32

Message:

Plugin Directory: Ensure that only valid WP_User objects are returned from Tools::get_plugin_subscribers().

See #1584

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-tools.php (modified) (2 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-tools.php

@@ -265 +265 @@
         public static function get_plugin_subscribers( $plugin_slug, $include_committers = false ) {
                 global $wpdb;
-                $post = Plugin_Directory::get_plugin_post( $plugin_slug );
-                if ( ! $post ) {
-                        return false;
-                }
 
                 $users = array();
-
-                // These users are subscribed the plugin commits.
-                $subscribers = get_post_meta( $post->ID, '_commit_subscribed', true ) ?: array();
-                foreach ( $subscribers as $subscriber_id ) {
-                        $users[] = get_user_by( 'id', $subscriber_id );
-                }
-
-                // Plugin Committers are always subscrived to plugin commits.
-                $committers  = self::get_plugin_committers( $plugin_slug );
-                foreach ( $committers as $committer ) {
-                        $users[] = get_user_by( 'login', $committer );
-                }
 
                 // Include the subscribers from the bbPress plugin directory until we've fully migrated.
@@ -288 +272 @@
                 if ( $bbpress_subscribers ) {
                         foreach ( array_keys( $bbpress_subscribers ) as $subscriber_id ) {
-                                $users[] = get_user_by( 'id', $subscriber_id );
+                                if ( $subscriber_id && $user = get_user_by( 'id', $subscriber_id ) ) {
+                                        $users[] = $user;
+                                }
                         }
                 }
 
-                $users = array_filter( $users );
+                // Plugin Committers are always subscrived to plugin commits.
+                $committers  = self::get_plugin_committers( $plugin_slug );
+                foreach ( $committers as $committer ) {
+                        if ( $committer && $user = get_user_by( 'login', $committer ) ) {
+                                $users[] = $user;
+                        }
+                }
+
+                $post = Plugin_Directory::get_plugin_post( $plugin_slug );
+                if ( ! $post ) {
+                        return $users;
+                }
+
+                // These users are subscribed the plugin commits.
+                $subscribers = get_post_meta( $post->ID, '_commit_subscribed', true ) ?: array();
+                foreach ( $subscribers as $subscriber_id ) {
+                        if ( $subscriber_id && $user = get_user_by( 'id', $subscriber_id ) ) {
+                                $users[] = $user;
+                        }
+                }
 
                 return $users;