Ticket #2767: 2767.3.patch

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

@@ -400 +400 @@
         }
 
         /**
+         * Returns the URL to the plugin support forum.
+         *
+         * @static
+         *
+         * @param int|\WP_Post|null $post  Optional. Post ID or post object. Defaults to global $post.
+         * @return string
+         */
+        public static function get_support_url( $post = null ) {
+                $post = get_post( $post );
+
+                /*
+                 * bbPress and BuddyPress get special treatment here.
+                 * In the future we could open this up to all plugins that define a custom support URL.
+                 */
+                if ( 'buddypress' === $post->post_name ) {
+                        $url = 'https://buddypress.org/support/';
+                } elseif ( 'bbpress' === $post->post_name ) {
+                        $url = 'https://bbpress.org/forums/';
+                } else {
+                        $url = 'https://wordpress.org/support/plugin/' . $post->post_name;
+                }
+
+                return $url;
+        }
+
+        /**
          * A helper method to create dashicon stars.
          *
          * @static

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

@@ -1 +1 @@
 <?php
 namespace WordPressdotorg\Plugin_Directory\Widgets;
+use WordPressdotorg\Plugin_Directory\Template;
 
 /**
  * A Widget to display support information about a plugin.
@@ -31 +32 @@
                 $threads     = get_post_meta( $post->ID, 'support_threads', true ) ?: 0;
                 $resolved    = get_post_meta( $post->ID, 'support_threads_resolved', true ) ?: 0;
                 $resolutions = (bool) $threads;
-                $support_url = 'https://wordpress.org/support/plugin/' . $post->post_name;
+                $support_url = Template::get_support_url();
 
-                /*
-                 * bbPress and BuddyPress get special treatment here.
-                 * In the future we could open this up to all plugins that define a custom support URL.
-                 */
-                if ( 'buddypress' === $post->post_name ) {
+                if ( false === strpos( $support_url, 'https://wordpress.org' ) ) {
                         $resolutions = false;
-                        $support_url = 'https://buddypress.org/support/';
-                } else if ( 'bbpress' === $post->post_name ) {
-                        $resolutions = false;
-                        $support_url = 'https://bbpress.org/forums/';
                 }
 
                 echo $args['before_widget'];
@@ -57 +50 @@
                                 </span>
                                 <span class="counter-count">
                                         <?php
-                                        /* Translators: 1: AMount of resolved threads; 2: Amount of total threads; */
+                                        /* Translators: 1: Amount of resolved threads; 2: Amount of total threads; */
                                         printf( __( '%1$s out of %2$s', 'wporg-plugins' ), $resolved, $threads );
                                         ?>
                                 </span>

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/template-parts/plugin-single.php

@@ -125 +125 @@
         <ul class="tabs clear">
                 <li id="tablink-description"><a href='#description'><?php _e( 'Details', 'wporg-plugins' ); ?></a></li>
                 <li id="tablink-reviews"><a href='#reviews'><?php _e( 'Reviews', 'wporg-plugins' ); ?></a></li>
-<?php if ( isset( $content[ 'installation' ] ) ) { ?>
-                <li id="tablink-installation"><a href='#installation'><?php _e( 'Installation', 'wporg-plugins' ); ?></a></li>
-<?php } ?>
-                <li id="tablink-support"><a href='https://wordpress.org/support/plugin/<?php echo $post->post_name; ?>'><?php _e( 'Support', 'wporg-plugins' ); ?></a></li>
+                <?php if ( isset( $content[ 'installation' ] ) ) { ?>
+                        <li id="tablink-installation"><a href='#installation'><?php _e( 'Installation', 'wporg-plugins' ); ?></a></li>
+                <?php } ?>
+                <li id="tablink-support"><a href='<?php echo Template::get_support_url(); ?>'><?php _e( 'Support', 'wporg-plugins' ); ?></a></li>
                 <li id="tablink-developers"><a href='#developers'><?php _e( 'Development', 'wporg-plugins' ); ?></a></li>
     </ul>
 <?php } ?>