<!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][4317] trunk: Remove duplicated check for group forums in the screen code.</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>4317</dd>
<dt>Author</dt> <dd>djpaul</dd>
<dt>Date</dt> <dd>2011-04-30 17:41:29 +0000 (Sat, 30 Apr 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove duplicated check for group forums in the screen code.
Also adds checks to make sure the group's forum is set up and ready to go.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpgroupsbpgroupsscreensphp">trunk/bp-groups/bp-groups-screens.php</a></li>
<li><a href="#trunkbpthemesbpdefaultgroupssinglehomephp">trunk/bp-themes/bp-default/groups/single/home.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpgroupsbpgroupsscreensphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups/bp-groups-screens.php (4316 => 4317)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/bp-groups-screens.php 2011-04-30 16:27:58 UTC (rev 4316)
+++ trunk/bp-groups/bp-groups-screens.php 2011-04-30 17:41:29 UTC (rev 4317)
</span><span class="lines">@@ -105,6 +105,9 @@
</span><span class="cx"> function groups_screen_group_forum() {
</span><span class="cx"> global $bp, $wp_query;
</span><span class="cx">
</span><ins>+ if ( !bp_is_active( 'forums' ) || !bp_forums_is_installed_correctly() )
+ return false;
+
</ins><span class="cx"> if ( bp_is_single_item() && $bp->groups->current_group->user_has_access ) {
</span><span class="cx">
</span><span class="cx"> // Fetch the details we need
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultgroupssinglehomephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/groups/single/home.php (4316 => 4317)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/groups/single/home.php 2011-04-30 16:27:58 UTC (rev 4316)
+++ trunk/bp-themes/bp-default/groups/single/home.php 2011-04-30 17:41:29 UTC (rev 4317)
</span><span class="lines">@@ -38,16 +38,13 @@
</span><span class="cx"> elseif ( bp_is_group_invites() && bp_group_is_visible() ) :
</span><span class="cx"> locate_template( array( 'groups/single/send-invites.php' ), true );
</span><span class="cx">
</span><del>- elseif ( bp_is_group_forum() && bp_group_is_visible() ) :
- locate_template( array( 'groups/single/forum.php' ), true );
-
</del><span class="cx"> elseif ( bp_is_group_membership_request() ) :
</span><span class="cx"> locate_template( array( 'groups/single/request-membership.php' ), true );
</span><span class="cx">
</span><span class="cx"> elseif ( bp_group_is_visible() && bp_is_active( 'activity' ) ) :
</span><span class="cx"> locate_template( array( 'groups/single/activity.php' ), true );
</span><span class="cx">
</span><del>- elseif ( bp_group_is_visible() && bp_is_active( 'forums' ) ) :
</del><ins>+ elseif ( bp_is_group_forum() && bp_group_is_visible() && bp_is_active( 'forums' ) && bp_forums_is_installed_correctly() ) :
</ins><span class="cx"> locate_template( array( 'groups/single/forum.php' ), true );
</span><span class="cx">
</span><span class="cx"> elseif ( bp_group_is_visible() ) :
</span></span></pre>
</div>
</div>
</body>
</html>