Changeset 3631

Timestamp:

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

Author:

djpaul

Message:

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

Location:

trunk

Files:

• bp-core/bp-core-templatetags.php (modified) (3 diffs)
• bp-forums.php (modified) (1 diff)
• bp-themes/bp-default/functions.php (modified) (3 diffs)
• bp-themes/bp-default/groups/single/forum/topic.php (modified) (1 diff)

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' );
 

trunk/bp-forums.php

@@ -51 +51 @@
 }
 
+/**
+ * Convenience function to determine if the forum directory has been disabled
+ * by the site admin.
+ *
+ * @global $bp The global BuddyPress settings variable created in bp_core_setup_globals()
+ * @return bool True if forum is disabled
+ * @since 1.3
+ */
+function bp_forum_directory_is_disabled() {
+    global $bp;
+
+    return !empty( $bp->site_options['bp-disable-forum-directory'] );
+}
+
 function bp_forums_directory_forums_setup() {
     global $bp;
 
     if ( $bp->current_component == $bp->forums->slug ) {
-        if ( (int) $bp->site_options['bp-disable-forum-directory'] || !bp_is_active( 'groups' ) )
+        if ( bp_forum_directory_is_disabled() || !bp_is_active( 'groups' ) )
             return false;
 

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

@@ -468 +468 @@
     add_action( 'admin_notices', 'bp_dtheme_show_notice' );
 
+if ( !function_exists( 'bp_dtheme_main_nav' ) ) :
 /**
  * wp_nav_menu() callback from the main navigation in header.php
@@ -478 +479 @@
  * @since 1.3
  */
-function bp_dtheme_main_nav( $args ) { ?>
+function bp_dtheme_main_nav( $args ) {
+    global $bp;
+
+    $pages_args = array(
+        'title_li' => '',
+        'depth' => '0',
+        'exclude' => bp_dtheme_page_on_front()
+    );
+
+    if ( bp_forum_directory_is_disabled() ) {
+        if ( !empty( $pages_args['exclude'] ) )
+                $pages_args['exclude'] .= ',';
+
+        $pages_args['exclude'] .= $bp->pages->forums->id;
+    }
+?>
     <ul id="nav">
         <li<?php if ( is_front_page() ) : ?> class="selected"<?php endif; ?>>
@@ -484 +500 @@
         </li>
 
-        <?php wp_list_pages( 'title_li=&depth=0&exclude=' . bp_dtheme_page_on_front() ); ?>
-        <?php do_action( 'bp_nav_items' ); ?>
+        <?php wp_list_pages( $pages_args ) ?>
+        <?php do_action( 'bp_nav_items' ) ?>
     </ul><!-- #nav -->
 <?php
 }
+endif;
 
 /**

trunk/bp-themes/bp-default/groups/single/forum/topic.php

@@ -19 +19 @@
         <div id="topic-meta">
             <h3><?php bp_the_topic_title() ?> (<?php bp_the_topic_total_post_count() ?>)</h3>
-            <a class="button" href="<?php bp_forum_permalink() ?>/">&larr; <?php _e( 'Group Forum', 'buddypress' ) ?></a> &nbsp; <a class="button" href="<?php bp_forum_directory_permalink() ?>/"><?php _e( 'Group Forum Directory', 'buddypress') ?></a>
+            <a class="button" href="<?php bp_forum_permalink() ?>/">&larr; <?php _e( 'Group Forum', 'buddypress' ) ?></a> &nbsp; <?php if ( !bp_forum_directory_is_disabled() ) : ?><a class="button" href="<?php bp_forum_directory_permalink() ?>/"><?php _e( 'Group Forum Directory', 'buddypress') ?></a><?php endif; ?>
 
             <div class="admin-links">