Ticket #3722: 3722.patch

sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-hooks.php

@@ -4 +4 @@
 
 class Hooks {
 
+        private $has_new_topic_button = false;
+
         const SITE_URL_META = '_wporg_bbp_topic_site_url';
 
         public function __construct() {
@@ -241 +243 @@
          * Displays a link to the new topic form.
          */
         public function new_topic_link() {
-                if ( bbp_is_single_forum() ) {
+                if ( bbp_is_single_forum() && bbp_current_user_can_access_create_topic_form() && ! $this->has_new_topic_button ) {
                         printf( '<a class="button create-topic" href="#new-topic-0">%s</a>', __( 'Create Topic', 'wporg-forums' ) );
+
+                        /*
+                         * The $has_new_topic_button class variable prevents us from adding the create topic button
+                         * multiple times on the same page in cases where the pagination links are used more than once.
+                         *
+                         * This avoids adding a create button at the bottom of the page, next to the create form.
+                         */
+                        $this->has_new_topic_button = true;
                 }
         }
 

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/sidebar.php

@@ -25 +25 @@
                                         <?php bb_base_single_forum_description(); ?>
                                         <li><a class="feed" href="<?php bbp_forum_permalink(); ?>feed/"><?php _e( 'Recent Posts', 'wporg-forums' ); ?></a></li>
                                         <li><a class="feed" href="<?php bbp_forum_permalink(); ?>feed/?type=topic"><?php _e( 'Recent Topics', 'wporg-forums' ); ?></a></li>
-                                        <?php if ( bbp_current_user_can_access_create_topic_form() ) : ?>
-                                                <li class="create-topic"><a href="#new-post"><?php _e( 'Create Topic', 'wporg-forums' ); ?></a></li>
-                                        <?php endif; ?>
                                         <?php if ( is_user_logged_in() && $forum_subscription_link = bbp_get_forum_subscription_link() ) : ?>
                                                 <li class="forum-subscribe"><?php echo $forum_subscription_link; ?></li>
                                         <?php endif; ?>