Changeset 4971 for trunk/includes/common/shortcodes.php

Timestamp:

05/28/2013 11:12:36 PM (13 years ago)

Author:

johnjamesjacoby

Message:

Allow the search feature to be toggled on and off. Introduces new setting and supporting function to get and override the option easily in third party plugins. Fixes #2342.

File:

• trunk/includes/common/shortcodes.php (modified) (2 diffs)

trunk/includes/common/shortcodes.php

@@ -621 +621 @@
     public function display_search_form() {
 
+        // Bail if search is disabled
+        if ( ! bbp_allow_search() ) {
+            return;
+        }
+
         // Start output buffer
         $this->start( 'bbp_search_form' );
@@ -645 +650 @@
 
         // Sanity check required info
-        if ( !empty( $content ) )
+        if ( !empty( $content ) ) {
             return $content;
+        }
+
+        // Bail if search is disabled
+        if ( ! bbp_allow_search() ) {
+            return;
+        }
 
         // Trim search attribute if it's set