Changeset 3068

Timestamp:

06/26/2010 11:30:43 PM (15 years ago)

Author:

johnjamesjacoby

Message:

Fixes #1956

Location:

branches/1.2

Files:

• bp-core/bp-core-templatetags.php (modified) (1 diff)
• bp-themes/bp-default/header.php (modified) (1 diff)

branches/1.2/bp-core/bp-core-templatetags.php

@@ -995 +995 @@
     }
 
+/**
+ * bp_search_form_available()
+ *
+ * Only show the search form if there are available objects to search for.
+ *
+ * @global array $bp
+ * @uses function_exists
+ * @uses bp_core_is_multisite()
+ * @return bool Filterable result
+ */
+function bp_search_form_enabled() {
+    global $bp;
+
+    if ( function_exists( 'xprofile_install' )
+         || function_exists( 'groups_install' )
+         || ( function_exists( 'bp_blogs_install' ) && bp_core_is_multisite() )
+         || ( function_exists( 'bp_forums_setup' ) && !(int)$bp->site_options['bp-disable-forum-directory'] )
+        ) {
+        $search_enabled = true;
+    } else {
+        $search_enabled = false;
+    }
+
+    return apply_filters( 'bp_search_form_enabled', $search_enabled );
+}
+
 function bp_search_form_action() {
     global $bp;

branches/1.2/bp-themes/bp-default/header.php

@@ -85 +85 @@
                 <div class="padder">
 
-                <form action="<?php echo bp_search_form_action() ?>" method="post" id="search-form">
-                    <input type="text" id="search-terms" name="search-terms" value="" />
-                    <?php echo bp_search_form_type_select() ?>
+                <?php if ( bp_search_form_enabled() ) : ?>
 
-                    <input type="submit" name="search-submit" id="search-submit" value="<?php _e( 'Search', 'buddypress' ) ?>" />
-                    <?php wp_nonce_field( 'bp_search_form' ) ?>
-                </form><!-- #search-form -->
+                    <form action="<?php echo bp_search_form_action() ?>" method="post" id="search-form">
+                        <input type="text" id="search-terms" name="search-terms" value="" />
+                        <?php echo bp_search_form_type_select() ?>
+
+                        <input type="submit" name="search-submit" id="search-submit" value="<?php _e( 'Search', 'buddypress' ) ?>" />
+                        <?php wp_nonce_field( 'bp_search_form' ) ?>
+                    </form><!-- #search-form -->
+
+                <?php endif; ?>
 
                 <?php do_action( 'bp_search_login_bar' ) ?>