<!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][5355] trunk: Ensures that Sitewide Tags blog posts do not go to the activity stream (unless explicitly told to do so by filtering 'bp_blogs_block_sitewide_tags_activity').</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><a href="http://buddypress.trac.wordpress.org/changeset/5355">5355</a></dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2011-11-24 03:08:26 +0000 (Thu, 24 Nov 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Ensures that Sitewide Tags blog posts do not go to the activity stream (unless explicitly told to do so by filtering 'bp_blogs_block_sitewide_tags_activity'). Fixes <a href="http://buddypress.trac.wordpress.org/ticket/3742">#3742</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpblogsbpblogsfunctionsphp">trunk/bp-blogs/bp-blogs-functions.php</a></li>
<li><a href="#trunkbpcorebpcorefunctionsphp">trunk/bp-core/bp-core-functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpblogsbpblogsfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-blogs/bp-blogs-functions.php (5354 => 5355)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-blogs/bp-blogs-functions.php 2011-11-24 02:46:56 UTC (rev 5354)
+++ trunk/bp-blogs/bp-blogs-functions.php 2011-11-24 03:08:26 UTC (rev 5355)
</span><span class="lines">@@ -160,8 +160,16 @@
</span><span class="cx"> if ( !$user_id )
</span><span class="cx"> $user_id = (int)$post->post_author;
</span><span class="cx">
</span><del>- // This is to stop infinite loops with Donncha's sitewide tags plugin
- if ( !empty( $bp->site_options['tags_blog_id'] ) && (int)$blog_id == (int)$bp->site_options['tags_blog_id'] )
</del><ins>+ // Stop infinite loops with WordPress MU Sitewide Tags.
+ // That plugin changed the way its settings were stored at some point. Thus the dual check.
+ if ( !empty( $bp->site_options['sitewide_tags_blog'] ) ) {
+ $st_options = maybe_unserialize( $bp->site_options['sitewide_tags_blog'] );
+ $tags_blog_id = isset( $st_options['tags_blog_id'] ) ? $st_options['tags_blog_id'] : 0;
+ } else {
+ $tags_blog_id = isset( $bp->site_options['tags_blog_id'] ) ? $bp->site_options['tags_blog_id'] : 0;
+ }
+
+ if ( (int)$blog_id == $tags_blog_id && apply_filters( 'bp_blogs_block_sitewide_tags_activity', true ) )
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> // Don't record this if it's not a post
</span><span class="lines">@@ -305,8 +313,6 @@
</span><span class="cx"> else
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><del>-
-
</del><span class="cx">
</span><span class="cx"> if ( $role != 'subscriber' )
</span><span class="cx"> bp_blogs_record_blog( $blog_id, $user_id, true );
</span></span></pre></div>
<a id="trunkbpcorebpcorefunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-functions.php (5354 => 5355)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-functions.php 2011-11-24 02:46:56 UTC (rev 5354)
+++ trunk/bp-core/bp-core-functions.php 2011-11-24 03:08:26 UTC (rev 5355)
</span><span class="lines">@@ -1062,9 +1062,10 @@
</span><span class="cx"> // On Multisite installations, some options must always be fetched from sitemeta
</span><span class="cx"> if ( is_multisite() ) {
</span><span class="cx"> $network_options = apply_filters( 'bp_core_network_options', array(
</span><del>- 'tags_blog_id' => '0',
- 'registration' => '0',
- 'fileupload_maxk' => '1500'
</del><ins>+ 'tags_blog_id' => '0',
+ 'sitewide_tags_blog' => '',
+ 'registration' => '0',
+ 'fileupload_maxk' => '1500'
</ins><span class="cx"> ) );
</span><span class="cx">
</span><span class="cx"> $current_site = get_current_site();
</span></span></pre>
</div>
</div>
</body>
</html>