Changeset 5121 for sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/shortcodes/class-developers.php

Timestamp:

03/08/2017 12:06:02 AM (8 years ago)

Author:

obenland

Message:

Plugin Directory: Fix display of plugin contributors

• Re-uses the contributor widget in the shortcode
• Displays committer-, contributor-, and code-browse-lists correctly
• Fixes the read-more link for contributor list in admin

See #2111.
Fixes #2567

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/shortcodes/class-developers.php (modified) (1 diff)

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

@@ -15 +15 @@
      */
     static function display() {
-        $post         = get_post();
-        $output = '';
+        $post   = get_post();
+        $output = '<p>' . __( 'This is open source software. The following people have contributed to this plugin.', 'wporg-plugins' ) . '</p>';
 
-        $contributors = get_terms( array(
-            'taxonomy' => 'plugin_contributors',
-            'object_ids' => array( $post->ID ),
-            'orderby' => 'term_order',
-            'fields' => 'names',
+        ob_start();
+        the_widget( 'WordPressdotorg\Plugin_Directory\Widgets\Contributors', array(), array(
+            'before_title'  => '<span class="screen-reader-text">',
+            'after_title'   => '</span>',
+            'before_widget' => '',
+            'after_widget'  => '',
         ) );
 
-        if ( ! $contributors || is_wp_error( $contributors ) ) {
-            $contributors = array();
-            if ( $author = get_user_by( 'id', $post->post_author ) ) {
-                $contributors[] = $author->user_nicename;
-            }
-        }
-
-        $output .= '<p>' . __( 'This is open source software. The following people have contributed to this plugin.', 'wporg-plugins' ) . '</p>';
-
-        $output .= '<ul class="plugin-developers">';
-        foreach ( $contributors as $contributor_slug ) {
-            $contributor = get_user_by( 'slug', $contributor_slug );
-            if ( ! $contributor ) {
-                continue;
-            }
-
-            $output .= '<li>' . get_avatar( $contributor->ID, 32 ) . '<a href="' . esc_url( 'https://profiles.wordpress.org/' . $contributor_slug ) . '">' . Template::encode( $contributor->display_name ) . '</a></li>';
-        }
-        $output .= '</ul>';
+        $output .= ob_get_clean();
 
         if ( is_user_logged_in() ) {
             $subscribed = Tools::subscribed_to_plugin_commits( $post, get_current_user_id() );
 
-            $subscribe_change_url = esc_url( add_query_arg(
-                array(
-                    '_wpnonce' => wp_create_nonce( 'wp_rest' ),
-                    ( $subscribed ? 'unsubscribe' : 'subscribe' ) => '1'
-                ),
-                home_url( 'wp-json/plugins/v1/plugin/' . $post->post_name . '/commit-subscription' )
-            ) );
+            $subscribe_change_url = esc_url( add_query_arg( array(
+                '_wpnonce' => wp_create_nonce( 'wp_rest' ),
+                ( $subscribed ? 'unsubscribe' : 'subscribe' ) => '1',
+            ), home_url( 'wp-json/plugins/v1/plugin/' . $post->post_name . '/commit-subscription' ) ) );
         }