Changeset 4532

Timestamp:

06/19/2011 02:50:06 PM (14 years ago)

Author:

djpaul

Message:

Deprecate bp_search_form_enabled() as it's not required; you'll always be able to search posts.

Location:

trunk

Files:

• bp-core/bp-core-template.php (modified) (1 diff)
• bp-core/deprecated/1.3.php (modified) (1 diff)
• bp-themes/bp-default/header.php (modified) (2 diffs)

trunk/bp-core/bp-core-template.php

@@ -295 +295 @@
 
 /** Search Form ***************************************************************/
-
-/**
- * bp_search_form_available()
- *
- * Only show the search form if there are available objects to search for.
- *
- * @uses function_exists
- * @uses is_multisite()
- * @return bool Filterable result
- */
-function bp_search_form_enabled() {
-    if ( bp_is_active( 'xprofile' )
-         || bp_is_active( 'groups' )
-         || ( bp_is_active( 'blogs' ) && is_multisite() )
-         || ( bp_is_active( 'forums' ) && !bp_forum_directory_is_disabled() )
-    ) {
-        $search_enabled = true;
-    } else {
-        $search_enabled = false;
-    }
-
-    return apply_filters( 'bp_search_form_enabled', $search_enabled );
-}
 
 function bp_search_form_action() {

trunk/bp-core/deprecated/1.3.php

@@ -370 +370 @@
     _deprecated_function( __FUNCTION__, '1.3', 'bp_loggedin_user_link' );
     bp_loggedin_user_link();
+}
+
+/**
+ * Only show the search form if there are available objects to search for.
+ * Deprecated in 1.3; not used anymore.
+ *
+ * @return bool
+ */
+function bp_search_form_enabled() {
+    _deprecated_function( __FUNCTION__, '1.3', 'No longer required.' );
+    return apply_filters( 'bp_search_form_enabled', true );
 }
 

trunk/bp-themes/bp-default/header.php

@@ -28 +28 @@
                     <h1 id="logo" role="banner"><a href="<?php echo home_url(); ?>" title="<?php echo _x( 'Home', 'Home page banner link title', 'buddypress' ); ?>"><?php bp_site_name(); ?></a></h1>
 
-                    <?php if ( bp_search_form_enabled() ) : ?>
-
                         <form action="<?php echo bp_search_form_action() ?>" method="post" id="search-form">
                             <label for="search-terms" class="accessibly-hidden"><?php _e( 'Search for:', 'buddypress' ); ?></label>
@@ -41 +39 @@
 
                         </form><!-- #search-form -->
-
-                    <?php endif; ?>
 
                 <?php do_action( 'bp_search_login_bar' ) ?>