<!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] [3160] branches/1.2/bp-core: Fixes #2554.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>3160</dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2010-08-09 19:49:03 +0000 (Mon, 09 Aug 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fixes #2554.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches12bpcorebpcoretemplatetagsphp">branches/1.2/bp-core/bp-core-templatetags.php</a></li>
<li><a href="#branches12bpcorebpcorewpabstractionphp">branches/1.2/bp-core/bp-core-wpabstraction.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 (3159 => 3160)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-core/bp-core-templatetags.php 2010-08-09 19:09:52 UTC (rev 3159)
+++ branches/1.2/bp-core/bp-core-templatetags.php 2010-08-09 19:49:03 UTC (rev 3160)
</span><span class="lines">@@ -1532,7 +1532,14 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function bp_is_activity_front_page() {
</span><del>- return ( 'page' == get_option('show_on_front') && 'activity' == get_option('page_on_front') && $_SERVER['REQUEST_URI'] == bp_core_get_site_path() );
</del><ins>+ global $current_blog;
+
+ if ( bp_core_is_main_site() )
+ $path = bp_core_get_site_path();
+ else
+ $path = $current_blog->path;
+
+ return ( 'page' == get_option('show_on_front') && 'activity' == get_option('page_on_front') && $_SERVER['REQUEST_URI'] == $path );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function bp_is_directory() {
</span></span></pre></div>
<a id="branches12bpcorebpcorewpabstractionphp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-core/bp-core-wpabstraction.php (3159 => 3160)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-core/bp-core-wpabstraction.php 2010-08-09 19:09:52 UTC (rev 3159)
+++ branches/1.2/bp-core/bp-core-wpabstraction.php 2010-08-09 19:49:03 UTC (rev 3160)
</span><span class="lines">@@ -24,6 +24,29 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+/**
+ * bp_core_is_main_site
+ *
+ * Checks if current blog is root blog of site
+ *
+ * @since 1,2,6
+ * @package BuddyPress
+ *
+ * @param int $blog_id optional blog id to test (default current blog)
+ * @return bool True if not multisite or $blog_id is main site
+ */
+function bp_core_is_main_site( $blog_id = '' ) {
+ global $current_site, $current_blog;
+
+ if ( !bp_core_is_multisite() )
+ return true;
+
+ if ( empty( $blog_id ) )
+ $blog_id = $current_blog->blog_id;
+
+ return $blog_id == $current_site->blog_id;
+}
+
</ins><span class="cx"> function bp_core_get_status_sql( $prefix = false ) {
</span><span class="cx"> if ( !bp_core_is_multisite() )
</span><span class="cx"> return "{$prefix}user_status = 0";
</span></span></pre>
</div>
</div>
</body>
</html>