<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[BuddyPress] [2741] branches/1.2: Applying previous commit to 1.2 branch</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>2741</dd>
<dt>Author</dt> <dd>apeatling</dd>
<dt>Date</dt> <dd>2010-02-18 16:49:30 +0000 (Thu, 18 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Applying previous commit to 1.2 branch</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches12bpcorebpcoretemplatetagsphp">branches/1.2/bp-core/bp-core-templatetags.php</a></li>
<li><a href="#branches12bpthemesbpdefaultgroupssinglehomephp">branches/1.2/bp-themes/bp-default/groups/single/home.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches12bpcorebpcoretemplatetagsphp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-core/bp-core-templatetags.php (2740 => 2741)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-core/bp-core-templatetags.php 2010-02-18 16:46:00 UTC (rev 2740)
+++ branches/1.2/bp-core/bp-core-templatetags.php 2010-02-18 16:49:30 UTC (rev 2741)
</span><span class="lines">@@ -1590,6 +1590,15 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+function bp_is_group_activity() {
+ global $bp;
+
+ if ( BP_GROUPS_SLUG == $bp->current_component && $bp->is_single_item && 'activity' == $bp->current_action )
+ return true;
+
+ return false;
+}
+
</ins><span class="cx"> function bp_is_group_forum_topic() {
</span><span class="cx"> global $bp;
</span><span class="cx">
</span></span></pre></div>
<a id="branches12bpthemesbpdefaultgroupssinglehomephp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-themes/bp-default/groups/single/home.php (2740 => 2741)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-themes/bp-default/groups/single/home.php 2010-02-18 16:46:00 UTC (rev 2740)
+++ branches/1.2/bp-themes/bp-default/groups/single/home.php 2010-02-18 16:49:30 UTC (rev 2741)
</span><span class="lines">@@ -38,10 +38,10 @@
</span><span class="cx"> <?php elseif ( bp_is_group_membership_request() ) : ?>
</span><span class="cx"> <?php locate_template( array( 'groups/single/request-membership.php' ), true ) ?>
</span><span class="cx">
</span><del>- <?php elseif ( bp_group_is_visible() ) : ?>
</del><ins>+ <?php elseif ( bp_group_is_visible() && bp_is_active( 'activity' ) ) : ?>
</ins><span class="cx"> <?php locate_template( array( 'groups/single/activity.php' ), true ) ?>
</span><span class="cx">
</span><del>- <?php else : ?>
</del><ins>+ <?php elseif ( !bp_group_is_visible() ) : ?>
</ins><span class="cx"> <?php /* The group is not visible, show the status message */ ?>
</span><span class="cx">
</span><span class="cx"> <?php do_action( 'bp_before_group_status_message' ) ?>
</span><span class="lines">@@ -51,6 +51,12 @@
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <?php do_action( 'bp_after_group_status_message' ) ?>
</span><ins>+
+ <?php else : ?>
+ <?php
+ /* If nothing sticks, just load a group front template if one exists. */
+ locate_template( array( 'groups/single/front.php' ), true );
+ ?>
</ins><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><span class="cx"> <?php do_action( 'bp_after_group_body' ) ?>
</span></span></pre>
</div>
</div>
</body>
</html>