<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[BuddyPress][3631] trunk: Hide forum directory from main nav if disabled by admin.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd>3631</dd>
<dt>Author</dt> <dd>djpaul</dd>
<dt>Date</dt> <dd>2010-12-31 17:49:36 +0000 (Fri, 31 Dec 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Hide forum directory from main nav if disabled by admin. Fixes #2541, props boonebgorges</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcorebpcoretemplatetagsphp">trunk/bp-core/bp-core-templatetags.php</a></li>
<li><a href="#trunkbpforumsphp">trunk/bp-forums.php</a></li>
<li><a href="#trunkbpthemesbpdefaultfunctionsphp">trunk/bp-themes/bp-default/functions.php</a></li>
<li><a href="#trunkbpthemesbpdefaultgroupssingleforumtopicphp">trunk/bp-themes/bp-default/groups/single/forum/topic.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpcorebpcoretemplatetagsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-templatetags.php (3630 => 3631)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-templatetags.php 2010-12-31 13:30:23 UTC (rev 3630)
+++ trunk/bp-core/bp-core-templatetags.php 2010-12-31 17:49:36 UTC (rev 3631)
</span><span class="lines">@@ -984,19 +984,16 @@
</span><span class="cx"> *
</span><span class="cx"> * Only show the search form if there are available objects to search for.
</span><span class="cx"> *
</span><del>- * @global array $bp
</del><span class="cx"> * @uses function_exists
</span><span class="cx"> * @uses is_multisite()
</span><span class="cx"> * @return bool Filterable result
</span><span class="cx"> */
</span><span class="cx"> function bp_search_form_enabled() {
</span><del>- global $bp;
-
</del><span class="cx"> if ( bp_is_active( 'xprofile' )
</span><span class="cx"> || bp_is_active( 'groups' )
</span><span class="cx"> || ( bp_is_active( 'blogs' ) && is_multisite() )
</span><del>- || ( function_exists( 'bp_forums_setup' ) && !(int)$bp->site_options['bp-disable-forum-directory'] )
- ) {
</del><ins>+ || ( bp_is_active( 'forums' ) && !bp_forum_directory_is_disabled() )
+ ) {
</ins><span class="cx"> $search_enabled = true;
</span><span class="cx"> } else {
</span><span class="cx"> $search_enabled = false;
</span><span class="lines">@@ -1029,7 +1026,7 @@
</span><span class="cx"> if ( bp_is_active( 'groups' ) )
</span><span class="cx"> $options['groups'] = __( 'Groups', 'buddypress' );
</span><span class="cx">
</span><del>- if ( function_exists( 'bp_forums_is_installed_correctly' ) && bp_forums_is_installed_correctly() && !isset( $bp->site_options['bp-disable-forum-directory'] ) )
</del><ins>+ if ( bp_is_active( 'forums' ) && bp_forums_is_installed_correctly() && !bp_forum_directory_is_disabled() )
</ins><span class="cx"> $options['forums'] = __( 'Forums', 'buddypress' );
</span><span class="cx">
</span><span class="cx"> if ( bp_is_active( 'blogs' ) && is_multisite() )
</span></span></pre></div>
<a id="trunkbpforumsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-forums.php (3630 => 3631)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-forums.php 2010-12-31 13:30:23 UTC (rev 3630)
+++ trunk/bp-forums.php 2010-12-31 17:49:36 UTC (rev 3631)
</span><span class="lines">@@ -50,11 +50,25 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+/**
+ * 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'] );
+}
+
</ins><span class="cx"> function bp_forums_directory_forums_setup() {
</span><span class="cx"> global $bp;
</span><span class="cx">
</span><span class="cx"> if ( $bp->current_component == $bp->forums->slug ) {
</span><del>- if ( (int) $bp->site_options['bp-disable-forum-directory'] || !bp_is_active( 'groups' ) )
</del><ins>+ if ( bp_forum_directory_is_disabled() || !bp_is_active( 'groups' ) )
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> if ( !bp_forums_is_installed_correctly() ) {
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/functions.php (3630 => 3631)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/functions.php 2010-12-31 13:30:23 UTC (rev 3630)
+++ trunk/bp-themes/bp-default/functions.php 2010-12-31 17:49:36 UTC (rev 3631)
</span><span class="lines">@@ -467,6 +467,7 @@
</span><span class="cx"> if ( is_admin() && isset($_GET['activated'] ) && $pagenow == "themes.php" )
</span><span class="cx"> add_action( 'admin_notices', 'bp_dtheme_show_notice' );
</span><span class="cx">
</span><ins>+if ( !function_exists( 'bp_dtheme_main_nav' ) ) :
</ins><span class="cx"> /**
</span><span class="cx"> * wp_nav_menu() callback from the main navigation in header.php
</span><span class="cx"> *
</span><span class="lines">@@ -477,17 +478,33 @@
</span><span class="cx"> * @see wp_nav_menu()
</span><span class="cx"> * @since 1.3
</span><span class="cx"> */
</span><del>-function bp_dtheme_main_nav( $args ) { ?>
</del><ins>+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;
+ }
+?>
</ins><span class="cx"> <ul id="nav">
</span><span class="cx"> <li<?php if ( is_front_page() ) : ?> class="selected"<?php endif; ?>>
</span><span class="cx"> <a href="<?php echo home_url() ?>" title="<?php _e( 'Home', 'buddypress' ) ?>"><?php _e( 'Home', 'buddypress' ) ?></a>
</span><span class="cx"> </li>
</span><span class="cx">
</span><del>- <?php wp_list_pages( 'title_li=&depth=0&exclude=' . bp_dtheme_page_on_front() ); ?>
- <?php do_action( 'bp_nav_items' ); ?>
</del><ins>+ <?php wp_list_pages( $pages_args ) ?>
+ <?php do_action( 'bp_nav_items' ) ?>
</ins><span class="cx"> </ul><!-- #nav -->
</span><span class="cx"> <?php
</span><span class="cx"> }
</span><ins>+endif;
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Applies BuddyPress customisations to the post comment form.
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultgroupssingleforumtopicphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/groups/single/forum/topic.php (3630 => 3631)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/groups/single/forum/topic.php 2010-12-31 13:30:23 UTC (rev 3630)
+++ trunk/bp-themes/bp-default/groups/single/forum/topic.php 2010-12-31 17:49:36 UTC (rev 3631)
</span><span class="lines">@@ -18,7 +18,7 @@
</span><span class="cx">
</span><span class="cx"> <div id="topic-meta">
</span><span class="cx"> <h3><?php bp_the_topic_title() ?> (<?php bp_the_topic_total_post_count() ?>)</h3>
</span><del>- <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>
</del><ins>+ <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; ?>
</ins><span class="cx">
</span><span class="cx"> <div class="admin-links">
</span><span class="cx"> <?php if ( bp_group_is_admin() || bp_group_is_mod() || bp_get_the_topic_is_mine() ) : ?>
</span></span></pre>
</div>
</div>
</body>
</html>