Ticket #4653: 4653.diff

trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/metabox/class-author-card.php

@@ -77 +77 @@
                                                 esc_attr__( 'Click to search Pluginrepo P2 for mentions of this author', 'wporg-plugins' )
                                         ),
                                         sprintf(
-                                                '<a href="https://supportpress.wordpress.org/plugins/?q=%s&status=&todo=Search+%%C2%%BB" title="%s">SP</a>',
-                                                urlencode( esc_attr( $author->user_nicename ) ),
-                                                esc_attr__( 'Click to search Pluginrepo SupportPress for mentions of this author', 'wporg-plugins' )
-                                        ),
-                                        sprintf(
                                                 '<a href="https://secure.helpscout.net/search/?query=mailbox:Plugins%%20%s" title="%s">HS</a>',
                                                 urlencode( esc_attr( $author->user_nicename ) ),
                                                 esc_attr__( 'Click to search Help Scout for mentions of this author', 'wporg-plugins' )
                                         ),
                                 );
-                                vprintf( '<span class="profile-sp-link">[ %s | %s | %s ]</span>', $author_links );
+                                vprintf( '<span class="profile-sp-link">[ %s | %s ]</span>', $author_links );
                                 ?>
 
                                 <span class="profile-links">
@@ -100 +95 @@
                                         <?php
                                         $author_email_links = array(
                                                 sprintf(
-                                                        '<a href="https://supportpress.wordpress.org/plugins/?sender=%s&status=&todo=Search" title="%s">SP</a>',
-                                                        urlencode( $author->user_email ),
-                                                        esc_attr__( 'Click to search Pluginrepo SupportPress for emails sent to/from this email address', 'wporg-plugins' )
-                                                ),
-                                                sprintf(
                                                         '<a href="https://secure.helpscout.net/search/?query=mailbox:Plugins%%20%s" title="%s">HS</a>',
                                                         urlencode( $author->user_email ),
                                                         esc_attr__( 'Click to search Help Scout for emails sent to/from this email address', 'wporg-plugins' )
                                                 ),
                                         );
-                                        vprintf( '<span class="profile-sp-link">[ %s | %s ]</span>', $author_email_links );
+                                        vprintf( '<span class="profile-sp-link">[ %s ]</span>', $author_email_links );
                                         ?>
                                 </div>
                                 <div class="profile-join">
@@ -358 +348 @@
                                 echo '*';
                         }
 
-                        vprintf( '<span class="profile-sp-link">[ %s | %s | %s | %s ]</span>', [
+                        vprintf( '<span class="profile-sp-link">[ %s | %s | %s ]</span>', [
                                 sprintf(
                                         '<a href="%s" title="%s">%s</a>',
                                         esc_url( get_edit_post_link( $plugin->ID, '' ) ),
@@ -371 +361 @@
                                         esc_attr__( 'Click to search Plugin Team P2 for mentions of this plugin', 'wporg-plugins' )
                                 ),
                                 sprintf(
-                                        '<a href="https://supportpress.wordpress.org/plugins/?q=%s&status=&todo=Search+%%C2%%BB" title="%s">SP</a>',
-                                        urlencode( esc_attr( $plugin_name ) ),
-                                        esc_attr__( 'Click to search Plugin SupportPress for mentions of this plugin', 'wporg-plugins' )
-                                ),
-                                sprintf(
                                         '<a href="https://secure.helpscout.net/search/?query=mailbox:Plugins%%20%s" title="%s">HS</a>',
                                         rawurlencode( esc_attr( $plugin_name ) ),
                                         esc_attr__( 'Click to search Help Scout for mentions of this plugin', 'wporg-plugins' )

trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/metabox/class-review-tools.php

@@ -294 +294 @@
                         }
 
                         // HelpScout requires urlencode() becuase it wants spaces as + signs.
-                        $contact_author = 'https://secure.helpscout.net/mailbox/ad3e85554c5bd064/new-ticket/?name=' . $author->display_name . '&email=' . $author->user_email . '&cc=' . $cc_emails . '&subject=' . urlencode( $subject );
+                        $contact_author = 'https://secure.helpscout.net/mailbox/ad3e85554c5bd064/new-ticket/?name=' . $author->display_name . '&email=' . urlencode( $author->user_email ) . '&cc=' . urlencode( $cc_emails ) . '&subject=' . urlencode( $subject );
                         ?>
                         <a id="contact-author" class="button button-primary" href="<?php echo esc_url( $contact_author ); ?>">Contact plugin committer(s)</a>
                         <?php