Changeset 3631 for trunk/bp-core/bp-core-templatetags.php

Timestamp:

12/31/2010 05:49:36 PM (16 years ago)

Author:

djpaul

Message:

Hide forum directory from main nav if disabled by admin. Fixes #2541, props boonebgorges

File:

• trunk/bp-core/bp-core-templatetags.php (modified) (3 diffs)

trunk/bp-core/bp-core-templatetags.php

@@ -985 +985 @@
  * Only show the search form if there are available objects to search for.
  *
- * @global array $bp
  * @uses function_exists
  * @uses is_multisite()
@@ -991 +990 @@
  */
 function bp_search_form_enabled() {
-        global $bp;
-
         if ( bp_is_active( 'xprofile' )
                  || bp_is_active( 'groups' )
                  || ( bp_is_active( 'blogs' ) && is_multisite() )
-                 || ( function_exists( 'bp_forums_setup' ) && !(int)$bp->site_options['bp-disable-forum-directory'] )
-                ) {
+                 || ( bp_is_active( 'forums' ) && !bp_forum_directory_is_disabled() )
+        ) {
                 $search_enabled = true;
         } else {
@@ -1030 +1027 @@
                 $options['groups'] = __( 'Groups', 'buddypress' );
 
-        if ( function_exists( 'bp_forums_is_installed_correctly' ) && bp_forums_is_installed_correctly() && !isset( $bp->site_options['bp-disable-forum-directory'] ) )
+        if ( bp_is_active( 'forums' ) && bp_forums_is_installed_correctly() && !bp_forum_directory_is_disabled() )
                 $options['forums'] = __( 'Forums', 'buddypress' );