<!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][8590] trunk/src/bp-blogs/bp-blogs-loader.php: Clean up `bp-blogs-loader.php`.</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 { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { 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/8590">8590</a></dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2014-07-10 22:34:55 +0000 (Thu, 10 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Clean up `bp-blogs-loader.php`.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpblogsbpblogsloaderphp">trunk/src/bp-blogs/bp-blogs-loader.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpblogsbpblogsloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/src/bp-blogs/bp-blogs-loader.php (8589 => 8590)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/bp-blogs/bp-blogs-loader.php 2014-07-10 22:22:16 UTC (rev 8589)
+++ trunk/src/bp-blogs/bp-blogs-loader.php 2014-07-10 22:34:55 UTC (rev 8590)
</span><span class="lines">@@ -45,8 +45,9 @@
</span><span class="cx"> public function setup_globals( $args = array() ) {
</span><span class="cx"> $bp = buddypress();
</span><span class="cx">
</span><del>- if ( !defined( 'BP_BLOGS_SLUG' ) )
</del><ins>+ if ( ! defined( 'BP_BLOGS_SLUG' ) ) {
</ins><span class="cx"> define ( 'BP_BLOGS_SLUG', $this->id );
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // Global tables for messaging component
</span><span class="cx"> $global_tables = array(
</span><span class="lines">@@ -58,8 +59,7 @@
</span><span class="cx"> 'blog' => $bp->table_prefix . 'bp_user_blogs_blogmeta',
</span><span class="cx"> );
</span><span class="cx">
</span><del>- // All globals for messaging component.
- // Note that global_tables is included in this array.
</del><ins>+ // All globals for blogs component.
</ins><span class="cx"> $args = array(
</span><span class="cx"> 'slug' => BP_BLOGS_SLUG,
</span><span class="cx"> 'root_slug' => isset( $bp->pages->blogs->slug ) ? $bp->pages->blogs->slug : BP_BLOGS_SLUG,
</span><span class="lines">@@ -83,6 +83,7 @@
</span><span class="cx"> * @param array $includes See {@link BP_Component::includes()}.
</span><span class="cx"> */
</span><span class="cx"> public function includes( $includes = array() ) {
</span><ins>+
</ins><span class="cx"> // Files to include
</span><span class="cx"> $includes = array(
</span><span class="cx"> 'cache',
</span><span class="lines">@@ -95,8 +96,9 @@
</span><span class="cx"> 'functions',
</span><span class="cx"> );
</span><span class="cx">
</span><del>- if ( is_multisite() )
</del><ins>+ if ( is_multisite() ) {
</ins><span class="cx"> $includes[] = 'widgets';
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // Include the files
</span><span class="cx"> parent::includes( $includes );
</span><span class="lines">@@ -120,8 +122,9 @@
</span><span class="cx"> * Although comments and posts made by users will still show on their
</span><span class="cx"> * activity stream.
</span><span class="cx"> */
</span><del>- if ( !is_multisite() )
</del><ins>+ if ( ! is_multisite() ) {
</ins><span class="cx"> return false;
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // Add 'Sites' to the main navigation
</span><span class="cx"> $main_nav = array(
</span><span class="lines">@@ -172,11 +175,12 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Site/post/comment menus should not appear on single WordPress setups.
</span><del>- * Although comments and posts made by users will still show on their
- * activity stream.
</del><ins>+ *
+ * Comments and posts made by users will still show in their activity.
</ins><span class="cx"> */
</span><del>- if ( !is_multisite() )
</del><ins>+ if ( ! is_multisite() ) {
</ins><span class="cx"> return false;
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // Menus for logged in user
</span><span class="cx"> if ( is_user_logged_in() ) {
</span></span></pre>
</div>
</div>
</body>
</html>