<!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] [3018] branches/1.2/bp-blogs.php: Remove current_site check.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>3018</dd>
<dt>Author</dt> <dd>apeatling</dd>
<dt>Date</dt> <dd>2010-05-23 19:50:27 +0000 (Sun, 23 May 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove current_site check.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches12bpblogsphp">branches/1.2/bp-blogs.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches12bpblogsphp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-blogs.php (3017 => 3018)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-blogs.php        2010-05-22 08:58:13 UTC (rev 3017)
+++ branches/1.2/bp-blogs.php        2010-05-23 19:50:27 UTC (rev 3018)
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx">         dbDelta($sql);
</span><span class="cx">
</span><span class="cx">         // On first installation - record all existing blogs in the system.
</span><del>-        if ( !(int)$bp->site_options['bp-blogs-first-install'] && bp_core_is_multisite() ) {
</del><ins>+        if ( !(int)get_site_option('bp-blogs-first-install') && bp_core_is_multisite() ) {
</ins><span class="cx">                 bp_blogs_record_existing_blogs();
</span><span class="cx">                 add_site_option( 'bp-blogs-first-install', 1 );
</span><span class="cx">         }
</span><span class="lines">@@ -295,12 +295,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function bp_blogs_record_existing_blogs() {
</span><del>-        global $bp, $wpdb, $current_site;
</del><ins>+        global $bp, $wpdb;
</ins><span class="cx">
</span><span class="cx">         /* Truncate user blogs table and re-record. */
</span><span class="cx">         $wpdb->query( "TRUNCATE TABLE {$bp->blogs->table_name}" );
</span><span class="cx">
</span><del>-        $blog_ids = $wpdb->get_col( $wpdb->prepare( "SELECT blog_id FROM {$wpdb->base_prefix}blogs WHERE mature = 0 AND spam = 0 AND deleted = 0 AND site_id = %d" ), $current_site->id );
</del><ins>+        $blog_ids = $wpdb->get_col( $wpdb->prepare( "SELECT blog_id FROM {$wpdb->base_prefix}blogs WHERE mature = 0 AND spam = 0 AND deleted = 0" ) );
</ins><span class="cx">
</span><span class="cx">         if ( $blog_ids ) {
</span><span class="cx">                 foreach( (array)$blog_ids as $blog_id ) {
</span></span></pre>
</div>
</div>
</body>
</html>