Changeset 3926

Timestamp:

09/02/2016 12:40:18 AM (8 years ago)

Author:

jmdodd

Message:

Forums Theme: Differentiate between international and support forum search.

Fixes regression introduced in [3918].

See #347.

Location:

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums

Files:

• functions.php (modified) (1 diff)
• page-homepage.php (modified) (1 diff)
• sidebar.php (modified) (3 diffs)

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/functions.php

@@ -400 +400 @@
 }
 add_action( 'bbp_template_after_topics_loop', 'bb_base_after_topics_loop' );
+
+function bb_is_intl_forum() {
+    return get_locale() != 'en_US';
+}
+

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-forums/page-homepage.php

@@ -32 +32 @@
             <h3><?php _e( 'Search the Support Forums', 'wporg-forums' ); ?></h3>
             <p><?php _e( 'Enter a few words that describe the problem you&rsquo;re having.', 'wporg-forums' ); ?></p>
-            <?php bb_base_search_form(); ?>
+            <?php
+                if ( bb_is_intl_forum() ) :
+                    bbp_get_template_part( 'form', 'search' );
+                else :
+                    bb_base_search_form();
+                endif;
+            ?>
             <h3><?php _e( 'Hot Topics', 'wporg-forums' ); ?></h3>
             <p class="frontpageheatmap">

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

@@ -3 +3 @@
     <?php if ( function_exists( 'is_bbpress' ) && ( is_bbpress() ) || is_page( 'new-topic' ) ) : ?>
 
-        <?php if ( bbp_is_single_forum() ) : ?>
+        <?php if ( bbp_is_single_forum() || ( bb_is_intl_forum() && bb_base_topic_search_query( false ) ) ) : ?>
 
             <div>
@@ -13 +13 @@
 
             <div>
-                <?php bb_base_search_form(); ?>
+                <?php
+                    if ( bb_is_intl_forum() ) :
+                        bb_base_topic_search_form();
+                    else :
+                        bb_base_search_form();
+                    endif;
+                ?>
             </div>
 
@@ -48 +54 @@
 
             <div>
-                <?php bb_base_search_form(); ?>
+                <?php
+                    if ( bb_is_intl_forum() ) :
+                        bbp_base_reply_search_form();
+                    else :
+                        bb_base_search_form();
+                    endif;
+                ?>
             </div>