<!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][7317] trunk/bp-blogs/bp-blogs-classes.php: Explicit visibility and static declarations in bp-blogs-classes.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/7317">7317</a></dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2013-07-26 18:13:54 +0000 (Fri, 26 Jul 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Explicit visibility and static declarations in bp-blogs-classes.php
See <a href="http://buddypress.trac.wordpress.org/ticket/3886">#3886</a>, <a href="http://buddypress.trac.wordpress.org/ticket/5108">#5108</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpblogsbpblogsclassesphp">trunk/bp-blogs/bp-blogs-classes.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpblogsbpblogsclassesphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-blogs/bp-blogs-classes.php (7316 => 7317)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-blogs/bp-blogs-classes.php 2013-07-26 18:13:51 UTC (rev 7316)
+++ trunk/bp-blogs/bp-blogs-classes.php 2013-07-26 18:13:54 UTC (rev 7317)
</span><span class="lines">@@ -18,18 +18,18 @@
</span><span class="cx"> * @subpackage BlogsClasses
</span><span class="cx"> */
</span><span class="cx"> class BP_Blogs_Blog {
</span><del>- var $id;
- var $user_id;
- var $blog_id;
</del><ins>+ public $id;
+ public $user_id;
+ public $blog_id;
</ins><span class="cx">
</span><del>- function __construct( $id = null ) {
</del><ins>+ public function __construct( $id = null ) {
</ins><span class="cx"> if ( !empty( $id ) ) {
</span><span class="cx"> $this->id = $id;
</span><span class="cx"> $this->populate();
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function populate() {
</del><ins>+ public function populate() {
</ins><span class="cx"> global $wpdb, $bp;
</span><span class="cx">
</span><span class="cx"> $blog = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$bp->blogs->table_name} WHERE id = %d", $this->id ) );
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx"> $this->blog_id = $blog->blog_id;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function save() {
</del><ins>+ public function save() {
</ins><span class="cx"> global $wpdb, $bp;
</span><span class="cx">
</span><span class="cx"> $this->user_id = apply_filters( 'bp_blogs_blog_user_id_before_save', $this->user_id, $this->id );
</span><span class="lines">@@ -73,7 +73,7 @@
</span><span class="cx"> return $wpdb->insert_id;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function exists() {
</del><ins>+ public function exists() {
</ins><span class="cx"> global $bp, $wpdb;
</span><span class="cx">
</span><span class="cx"> return $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(id) FROM {$bp->blogs->table_name} WHERE user_id = %d AND blog_id = %d", $this->user_id, $this->blog_id ) );
</span><span class="lines">@@ -81,7 +81,7 @@
</span><span class="cx">
</span><span class="cx"> /* Static Functions */
</span><span class="cx">
</span><del>- function get( $type, $limit = false, $page = false, $user_id = 0, $search_terms = false ) {
</del><ins>+ public static function get( $type, $limit = false, $page = false, $user_id = 0, $search_terms = false ) {
</ins><span class="cx"> global $bp, $wpdb;
</span><span class="cx">
</span><span class="cx"> if ( !is_user_logged_in() || ( !bp_current_user_can( 'bp_moderate' ) && ( $user_id != bp_loggedin_user_id() ) ) )
</span><span class="lines">@@ -127,14 +127,14 @@
</span><span class="cx"> return array( 'blogs' => $paged_blogs, 'total' => $total_blogs );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function delete_blog_for_all( $blog_id ) {
</del><ins>+ public static function delete_blog_for_all( $blog_id ) {
</ins><span class="cx"> global $wpdb, $bp;
</span><span class="cx">
</span><span class="cx"> bp_blogs_delete_blogmeta( $blog_id );
</span><span class="cx"> return $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->blogs->table_name} WHERE blog_id = %d", $blog_id ) );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function delete_blog_for_user( $blog_id, $user_id = null ) {
</del><ins>+ public static function delete_blog_for_user( $blog_id, $user_id = null ) {
</ins><span class="cx"> global $wpdb, $bp;
</span><span class="cx">
</span><span class="cx"> if ( !$user_id )
</span><span class="lines">@@ -143,7 +143,7 @@
</span><span class="cx"> return $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->blogs->table_name} WHERE user_id = %d AND blog_id = %d", $user_id, $blog_id ) );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function delete_blogs_for_user( $user_id = null ) {
</del><ins>+ public static function delete_blogs_for_user( $user_id = null ) {
</ins><span class="cx"> global $wpdb, $bp;
</span><span class="cx">
</span><span class="cx"> if ( !$user_id )
</span><span class="lines">@@ -152,7 +152,7 @@
</span><span class="cx"> return $wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->blogs->table_name} WHERE user_id = %d", $user_id ) );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function get_blogs_for_user( $user_id = 0, $show_hidden = false ) {
</del><ins>+ public static function get_blogs_for_user( $user_id = 0, $show_hidden = false ) {
</ins><span class="cx"> global $bp, $wpdb;
</span><span class="cx">
</span><span class="cx"> if ( !$user_id )
</span><span class="lines">@@ -178,7 +178,7 @@
</span><span class="cx"> return array( 'blogs' => $user_blogs, 'count' => $total_blog_count );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function get_blog_ids_for_user( $user_id = 0 ) {
</del><ins>+ public static function get_blog_ids_for_user( $user_id = 0 ) {
</ins><span class="cx"> global $bp, $wpdb;
</span><span class="cx">
</span><span class="cx"> if ( !$user_id )
</span><span class="lines">@@ -187,13 +187,13 @@
</span><span class="cx"> return $wpdb->get_col( $wpdb->prepare( "SELECT blog_id FROM {$bp->blogs->table_name} WHERE user_id = %d", $user_id ) );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function is_recorded( $blog_id ) {
</del><ins>+ public static function is_recorded( $blog_id ) {
</ins><span class="cx"> global $bp, $wpdb;
</span><span class="cx">
</span><span class="cx"> return $wpdb->get_var( $wpdb->prepare( "SELECT id FROM {$bp->blogs->table_name} WHERE blog_id = %d", $blog_id ) );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function total_blog_count_for_user( $user_id = null ) {
</del><ins>+ public static function total_blog_count_for_user( $user_id = null ) {
</ins><span class="cx"> global $bp, $wpdb;
</span><span class="cx">
</span><span class="cx"> if ( !$user_id )
</span><span class="lines">@@ -207,7 +207,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function search_blogs( $filter, $limit = null, $page = null ) {
</del><ins>+ public static function search_blogs( $filter, $limit = null, $page = null ) {
</ins><span class="cx"> global $wpdb, $bp;
</span><span class="cx">
</span><span class="cx"> $filter = esc_sql( like_escape( $filter ) );
</span><span class="lines">@@ -226,7 +226,7 @@
</span><span class="cx"> return array( 'blogs' => $paged_blogs, 'total' => $total_blogs );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function get_all( $limit = null, $page = null ) {
</del><ins>+ public static function get_all( $limit = null, $page = null ) {
</ins><span class="cx"> global $bp, $wpdb;
</span><span class="cx">
</span><span class="cx"> $hidden_sql = !bp_current_user_can( 'bp_moderate' ) ? "AND wb.public = 1" : '';
</span><span class="lines">@@ -238,7 +238,7 @@
</span><span class="cx"> return array( 'blogs' => $paged_blogs, 'total' => $total_blogs );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function get_by_letter( $letter, $limit = null, $page = null ) {
</del><ins>+ public static function get_by_letter( $letter, $limit = null, $page = null ) {
</ins><span class="cx"> global $bp, $wpdb;
</span><span class="cx">
</span><span class="cx"> $letter = esc_sql( like_escape( $letter ) );
</span><span class="lines">@@ -256,7 +256,7 @@
</span><span class="cx"> return array( 'blogs' => $paged_blogs, 'total' => $total_blogs );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function get_blog_extras( &$paged_blogs, &$blog_ids, $type = false ) {
</del><ins>+ public static function get_blog_extras( &$paged_blogs, &$blog_ids, $type = false ) {
</ins><span class="cx"> global $bp, $wpdb;
</span><span class="cx">
</span><span class="cx"> if ( empty( $blog_ids ) )
</span><span class="lines">@@ -310,7 +310,7 @@
</span><span class="cx"> return $paged_blogs;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- function is_hidden( $blog_id ) {
</del><ins>+ public static function is_hidden( $blog_id ) {
</ins><span class="cx"> global $wpdb;
</span><span class="cx">
</span><span class="cx"> if ( !(int) $wpdb->get_var( $wpdb->prepare( "SELECT DISTINCT public FROM {$wpdb->base_prefix}blogs WHERE blog_id = %d", $blog_id ) ) )
</span></span></pre>
</div>
</div>
</body>
</html>