<!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][5986] trunk: Whitespace cleanup</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/5986">5986</a></dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2012-04-13 16:31:42 +0000 (Fri, 13 Apr 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Whitespace cleanup</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcorebpcorecachephp">trunk/bp-core/bp-core-cache.php</a></li>
<li><a href="#trunkbpmembersbpmembersfunctionsphp">trunk/bp-members/bp-members-functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpcorebpcorecachephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-cache.php (5985 => 5986)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-cache.php 2012-04-13 14:00:50 UTC (rev 5985)
+++ trunk/bp-core/bp-core-cache.php 2012-04-13 16:31:42 UTC (rev 5986)
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx"> */
</span><span class="cx"> function bp_update_meta_cache( $args = array() ) {
</span><span class="cx"> global $wpdb;
</span><del>-
</del><ins>+
</ins><span class="cx"> $defaults = array(
</span><span class="cx"> 'object_ids' => array(), // Comma-separated list or array of item ids
</span><span class="cx"> 'object_type' => '', // Canonical component id: groups, members, etc
</span><span class="lines">@@ -65,15 +65,15 @@
</span><span class="cx"> );
</span><span class="cx"> $r = wp_parse_args( $args, $defaults );
</span><span class="cx"> extract( $r );
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( empty( $object_ids ) || empty( $object_type ) || empty( $meta_table ) ) {
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( empty( $cache_key_prefix ) ) {
</span><span class="cx"> $cache_key_prefix = $meta_table;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( empty( $object_column ) ) {
</span><span class="cx"> $object_column = $object_type . '_id';
</span><span class="cx"> }
</span><span class="lines">@@ -86,7 +86,7 @@
</span><span class="cx"> $object_ids = array_map( 'intval', $object_ids );
</span><span class="cx">
</span><span class="cx"> $cache = array();
</span><del>-
</del><ins>+
</ins><span class="cx"> // Get meta info
</span><span class="cx"> $id_list = join( ',', $object_ids );
</span><span class="cx"> $meta_list = $wpdb->get_results( $wpdb->prepare( "SELECT $object_column, meta_key, meta_value FROM $meta_table WHERE $object_column IN ($id_list)" ), ARRAY_A );
</span><span class="lines">@@ -107,11 +107,11 @@
</span><span class="cx"> $cache[$mpid][$mkey][] = $mval;
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> foreach ( $object_ids as $id ) {
</span><span class="cx"> if ( ! isset($cache[$id]) )
</span><span class="cx"> $cache[$id] = array();
</span><del>-
</del><ins>+
</ins><span class="cx"> foreach( $cache[$id] as $meta_key => $meta_value ) {
</span><span class="cx"> wp_cache_set( $cache_key_prefix . '_' . $id . '_' . $meta_key, $meta_value, 'bp' );
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkbpmembersbpmembersfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-members/bp-members-functions.php (5985 => 5986)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-members/bp-members-functions.php 2012-04-13 14:00:50 UTC (rev 5985)
+++ trunk/bp-members/bp-members-functions.php 2012-04-13 16:31:42 UTC (rev 5986)
</span><span class="lines">@@ -500,7 +500,7 @@
</span><span class="cx"> */
</span><span class="cx"> function bp_core_process_spammer_status( $user_id, $status ) {
</span><span class="cx"> global $wpdb;
</span><del>-
</del><ins>+
</ins><span class="cx"> // Only super admins can currently spam users
</span><span class="cx"> if ( !is_super_admin() || bp_is_my_profile() )
</span><span class="cx"> return;
</span><span class="lines">@@ -508,11 +508,11 @@
</span><span class="cx"> // Bail if no user ID
</span><span class="cx"> if ( empty( $user_id ) )
</span><span class="cx"> return;
</span><del>-
</del><ins>+
</ins><span class="cx"> // Bail if user ID is super admin
</span><span class="cx"> if ( is_super_admin( $user_id ) )
</span><span class="cx"> return;
</span><del>-
</del><ins>+
</ins><span class="cx"> // Get the functions file
</span><span class="cx"> if ( is_multisite() ) {
</span><span class="cx"> require_once( ABSPATH . 'wp-admin/includes/ms.php' );
</span><span class="lines">@@ -529,26 +529,26 @@
</span><span class="cx">
</span><span class="cx"> // Get the blogs for the user
</span><span class="cx"> $blogs = get_blogs_of_user( $user_id, true );
</span><del>-
</del><ins>+
</ins><span class="cx"> foreach ( (array) $blogs as $key => $details ) {
</span><del>-
</del><ins>+
</ins><span class="cx"> // Do not mark the main or current root blog as spam
</span><span class="cx"> if ( 1 == $details->userblog_id || bp_get_root_blog_id() == $details->userblog_id ) {
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> // Update the blog status
</span><span class="cx"> update_blog_status( $details->userblog_id, 'spam', $is_spam );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> // Finally, mark this user as a spammer
</span><span class="cx"> if ( is_multisite() ) {
</span><span class="cx"> update_user_status( $user_id, 'spam', $is_spam );
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> // Always set single site status
</span><span class="cx"> $wpdb->update( $wpdb->users, array( 'user_status' => $is_spam ), array( 'ID' => $user_id ) );
</span><del>-
</del><ins>+
</ins><span class="cx"> // Call multisite actions in single site mode for good measure
</span><span class="cx"> if ( !is_multisite() ) {
</span><span class="cx"> $wp_action = ( true === $is_spam ) ? 'make_spam_user' : 'make_ham_user';
</span><span class="lines">@@ -567,7 +567,7 @@
</span><span class="cx">
</span><span class="cx"> // Allow plugins to do neat things
</span><span class="cx"> do_action( 'bp_core_process_spammer_status', $user_id, $is_spam );
</span><del>-
</del><ins>+
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -575,7 +575,7 @@
</span><span class="cx"> * Hook to WP's make_spam_user and run our custom BP spam functions
</span><span class="cx"> *
</span><span class="cx"> * @since BuddyPress (1.6)
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @param int $user_id The user id passed from the make_spam_user hook
</span><span class="cx"> */
</span><span class="cx"> function bp_core_mark_user_spam_admin( $user_id ) {
</span><span class="lines">@@ -587,7 +587,7 @@
</span><span class="cx"> * Hook to WP's make_ham_user and run our custom BP spam functions
</span><span class="cx"> *
</span><span class="cx"> * @since BuddyPress (1.6)
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @param int $user_id The user id passed from the make_ham_user hook
</span><span class="cx"> */
</span><span class="cx"> function bp_core_mark_user_ham_admin( $user_id ) {
</span><span class="lines">@@ -672,9 +672,9 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Checks if user is active
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @since BuddyPress (1.6)
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @uses is_user_logged_in() To check if user is logged in
</span><span class="cx"> * @uses bp_loggedin_user_id() To get current user ID
</span><span class="cx"> * @uses bp_is_user_spammer() To check if user is spammer
</span><span class="lines">@@ -707,9 +707,9 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Checks if user is not active.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @since BuddyPress (1.6)
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @uses is_user_logged_in() To check if user is logged in
</span><span class="cx"> * @uses bp_get_displayed_user_id() To get current user ID
</span><span class="cx"> * @uses bp_is_user_active() To check if user is active
</span><span class="lines">@@ -1053,7 +1053,7 @@
</span><span class="cx">
</span><span class="cx"> $current_field = $usermeta["field_{$field_id}"];
</span><span class="cx"> xprofile_set_field_data( $field_id, $user_id, $current_field );
</span><del>-
</del><ins>+
</ins><span class="cx"> // Save the visibility level
</span><span class="cx"> $visibility_level = !empty( $usermeta['field_' . $field_id . '_visibility'] ) ? $usermeta['field_' . $field_id . '_visibility'] : 'public';
</span><span class="cx"> xprofile_set_field_visibility_level( $field_id, $user_id, $visibility_level );
</span><span class="lines">@@ -1115,7 +1115,7 @@
</span><span class="cx">
</span><span class="cx"> if ( !empty( $current_field ) )
</span><span class="cx"> xprofile_set_field_data( $field_id, $user_id, $current_field );
</span><del>-
</del><ins>+
</ins><span class="cx"> // Save the visibility level
</span><span class="cx"> $visibility_level = !empty( $user['meta']['field_' . $field_id . '_visibility'] ) ? $user['meta']['field_' . $field_id . '_visibility'] : 'public';
</span><span class="cx"> xprofile_set_field_visibility_level( $field_id, $user_id, $visibility_level );
</span><span class="lines">@@ -1259,7 +1259,7 @@
</span><span class="cx">
</span><span class="cx"> if ( is_admin() || is_network_admin() )
</span><span class="cx"> return;
</span><del>-
</del><ins>+
</ins><span class="cx"> // Not at the WP core signup page and action is not register
</span><span class="cx"> if ( false === strpos( $_SERVER['SCRIPT_NAME'], 'wp-signup.php' ) && ( 'register' != $action ) )
</span><span class="cx"> return;
</span></span></pre>
</div>
</div>
</body>
</html>