Ticket #5031: 5031.2.diff

class-hooks.php

@@ -631 +631 @@
 
                                 echo '<div class="bbp-create-topic-wrapper">';
                                 if ( $searchform ) {
-                                        printf(
-                                                /* translators: 1: markup for forums search field which is primary action, 2: markup for button to create topic */
-                                                __( '%1$s or %2$s', 'wporg-forums' ),
-                                                $searchform,
-                                                $btn
-                                        );
+
+                                        // We already have a review button in the control rendered above this one.
+                                        if( ! $is_reviews ) {
+                                                printf(
+                                                        /* translators: 1: markup for forums search field which is primary action, 2: markup for button to create topic */
+                                                        __( '%1$s or %2$s', 'wporg-forums' ),
+                                                        $searchform,
+                                                        $btn
+                                                );
+                                        } else {
+                                                echo $searchform;
+                                        }
                                 } else {
                                         echo $btn;
                                 }