Ticket #5031: 5031.diff

class-hooks.php

@@ -18 +18 @@
                 add_filter( 'old_slug_redirect_post_id',       array( $this, 'disable_wp_old_slug_redirect' ) );
                 add_action( 'template_redirect',               array( $this, 'redirect_update_php_page' ) );
                 add_action( 'template_redirect',               array( $this, 'redirect_legacy_user_structure' ) );
-                add_filter( 'wp_insert_post_data',             array( $this, 'set_post_date_gmt_for_pending_posts' ) );
+                add_filter( 'wp_insert_post_data',             array( $this, 'set_post_date_gmt_for_pending_posts' ) );
                 add_action( 'wp_print_footer_scripts',         array( $this, 'replace_quicktags_blockquote_button' ) );
 
                 // Output rel="canonical" meta tag. Runs before WP's rel_canonical to unhook that if needed.
@@ -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;
                                 }