<!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][8623] trunk/src/bp-members/bp-members-functions.php: Clean up brackets and code formatting in `bp-members-functions.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/8623">8623</a></dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2014-07-15 23:11:56 +0000 (Tue, 15 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Clean up brackets and code formatting in `bp-members-functions.php`.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpmembersbpmembersfunctionsphp">trunk/src/bp-members/bp-members-functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpmembersbpmembersfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/src/bp-members/bp-members-functions.php (8622 => 8623)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/bp-members/bp-members-functions.php 2014-07-15 23:01:15 UTC (rev 8622)
+++ trunk/src/bp-members/bp-members-functions.php 2014-07-15 23:11:56 UTC (rev 8623)
</span><span class="lines">@@ -35,11 +35,9 @@
</span><span class="cx"> *
</span><span class="cx"> * In general, fallback values are only used during initial BP page creation,
</span><span class="cx"> * when no slugs have been explicitly defined.
</span><del>- *
- * @global BuddyPress $bp The one true BuddyPress instance.
</del><span class="cx"> */
</span><span class="cx"> function bp_core_define_slugs() {
</span><del>- global $bp;
</del><ins>+ $bp = buddypress();
</ins><span class="cx">
</span><span class="cx"> // No custom members slug
</span><span class="cx"> if ( !defined( 'BP_MEMBERS_SLUG' ) ) {
</span><span class="lines">@@ -141,7 +139,7 @@
</span><span class="cx"> * @param string $user_nicename Optional. user_nicename of the user.
</span><span class="cx"> * @param string $user_login Optional. user_login of the user.
</span><span class="cx"> */
</span><del>-function bp_core_get_user_domain( $user_id, $user_nicename = false, $user_login = false ) {
</del><ins>+function bp_core_get_user_domain( $user_id = 0, $user_nicename = false, $user_login = false ) {
</ins><span class="cx">
</span><span class="cx"> if ( empty( $user_id ) ) {
</span><span class="cx"> return;
</span><span class="lines">@@ -169,9 +167,10 @@
</span><span class="cx"> * @param int $user_id The ID of the user.
</span><span class="cx"> * @return array
</span><span class="cx"> */
</span><del>-function bp_core_get_core_userdata( $user_id ) {
- if ( empty( $user_id ) )
</del><ins>+function bp_core_get_core_userdata( $user_id = 0 ) {
+ if ( empty( $user_id ) ) {
</ins><span class="cx"> return false;
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> if ( !$userdata = wp_cache_get( 'bp_core_userdata_' . $user_id, 'bp' ) ) {
</span><span class="cx"> $userdata = BP_Core_User::get_core_userdata( $user_id );
</span><span class="lines">@@ -318,7 +317,7 @@
</span><span class="cx"> * @return string|bool The username of the matched user, or false.
</span><span class="cx"> */
</span><span class="cx"> function bp_members_get_user_nicename( $user_id ) {
</span><del>- global $bp;
</del><ins>+ $bp = buddypress();
</ins><span class="cx">
</span><span class="cx"> if ( !$user_nicename = wp_cache_get( 'bp_members_user_nicename_' . $user_id, 'bp' ) ) {
</span><span class="cx"> $update_cache = true;
</span><span class="lines">@@ -354,8 +353,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Add this to cache
</span><del>- if ( true == $update_cache && !empty( $user_nicename ) )
</del><ins>+ if ( true == $update_cache && !empty( $user_nicename ) ) {
</ins><span class="cx"> wp_cache_set( 'bp_members_user_nicename_' . $user_id, $user_nicename, 'bp' );
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> return apply_filters( 'bp_members_get_user_nicename', $user_nicename );
</span><span class="cx"> }
</span><span class="lines">@@ -370,13 +370,16 @@
</span><span class="cx"> function bp_core_get_user_email( $uid ) {
</span><span class="cx">
</span><span class="cx"> if ( !$email = wp_cache_get( 'bp_user_email_' . $uid, 'bp' ) ) {
</span><ins>+
</ins><span class="cx"> // User exists
</span><del>- if ( $ud = bp_core_get_core_userdata( $uid ) )
</del><ins>+ $ud = bp_core_get_core_userdata( $uid );
+ if ( ! empty( $ud ) ) {
</ins><span class="cx"> $email = $ud->user_email;
</span><span class="cx">
</span><span class="cx"> // User was deleted
</span><del>- else
</del><ins>+ } else {
</ins><span class="cx"> $email = '';
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> wp_cache_set( 'bp_user_email_' . $uid, $email, 'bp' );
</span><span class="cx"> }
</span><span class="lines">@@ -402,17 +405,21 @@
</span><span class="cx"> function bp_core_get_userlink( $user_id, $no_anchor = false, $just_link = false ) {
</span><span class="cx"> $display_name = bp_core_get_user_displayname( $user_id );
</span><span class="cx">
</span><del>- if ( empty( $display_name ) )
</del><ins>+ if ( empty( $display_name ) ) {
</ins><span class="cx"> return false;
</span><ins>+ }
</ins><span class="cx">
</span><del>- if ( $no_anchor )
</del><ins>+ if ( ! empty( $no_anchor ) ) {
</ins><span class="cx"> return $display_name;
</span><ins>+ }
</ins><span class="cx">
</span><del>- if ( !$url = bp_core_get_user_domain( $user_id ) )
</del><ins>+ if ( !$url = bp_core_get_user_domain( $user_id ) ) {
</ins><span class="cx"> return false;
</span><ins>+ }
</ins><span class="cx">
</span><del>- if ( $just_link )
</del><ins>+ if ( ! empty( $just_link ) ) {
</ins><span class="cx"> return $url;
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> return apply_filters( 'bp_core_get_userlink', '<a href="' . $url . '" title="' . $display_name . '">' . $display_name . '</a>', $user_id );
</span><span class="cx"> }
</span><span class="lines">@@ -508,7 +515,6 @@
</span><span class="cx"> * user not found.
</span><span class="cx"> */
</span><span class="cx"> function bp_core_get_user_displayname( $user_id_or_username ) {
</span><del>- global $bp;
</del><span class="cx">
</span><span class="cx"> $fullname = '';
</span><span class="cx">
</span><span class="lines">@@ -560,10 +566,11 @@
</span><span class="cx"> * @return string|bool The link to the user's domain, false on no match.
</span><span class="cx"> */
</span><span class="cx"> function bp_core_get_userlink_by_username( $username ) {
</span><del>- if ( bp_is_username_compatibility_mode() )
</del><ins>+ if ( bp_is_username_compatibility_mode() ) {
</ins><span class="cx"> $user_id = bp_core_get_userid( $username );
</span><del>- else
</del><ins>+ } else {
</ins><span class="cx"> $user_id = bp_core_get_userid_from_nicename( $username );
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> return apply_filters( 'bp_core_get_userlink_by_username', bp_core_get_userlink( $user_id, false, false, true ) );
</span><span class="cx"> }
</span><span class="lines">@@ -640,12 +647,14 @@
</span><span class="cx"> global $wpdb;
</span><span class="cx">
</span><span class="cx"> // Bail if no user ID
</span><del>- if ( empty( $user_id ) )
</del><ins>+ if ( empty( $user_id ) ) {
</ins><span class="cx"> return;
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // Bail if user ID is super admin
</span><del>- if ( is_super_admin( $user_id ) )
</del><ins>+ if ( is_super_admin( $user_id ) ) {
</ins><span class="cx"> return;
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // Get the functions file
</span><span class="cx"> if ( is_multisite() ) {
</span><span class="lines">@@ -670,7 +679,7 @@
</span><span class="cx"> // Get the blogs for the user
</span><span class="cx"> $blogs = get_blogs_of_user( $user_id, true );
</span><span class="cx">
</span><del>- foreach ( (array) $blogs as $key => $details ) {
</del><ins>+ foreach ( (array) array_values( $blogs ) as $details ) {
</ins><span class="cx">
</span><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="lines">@@ -748,8 +757,9 @@
</span><span class="cx"> function bp_is_user_spammer( $user_id = 0 ) {
</span><span class="cx">
</span><span class="cx"> // No user to check
</span><del>- if ( empty( $user_id ) )
</del><ins>+ if ( empty( $user_id ) ) {
</ins><span class="cx"> return false;
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> $bp = buddypress();
</span><span class="cx">
</span><span class="lines">@@ -783,11 +793,13 @@
</span><span class="cx"> } else {
</span><span class="cx">
</span><span class="cx"> // Check if spam
</span><del>- if ( !empty( $user->spam ) )
</del><ins>+ if ( !empty( $user->spam ) ) {
</ins><span class="cx"> $is_spammer = true;
</span><ins>+ }
</ins><span class="cx">
</span><del>- if ( 1 == $user->user_status )
</del><ins>+ if ( 1 == $user->user_status ) {
</ins><span class="cx"> $is_spammer = true;
</span><ins>+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return apply_filters( 'bp_is_user_spammer', (bool) $is_spammer );
</span><span class="lines">@@ -802,8 +814,9 @@
</span><span class="cx"> function bp_is_user_deleted( $user_id = 0 ) {
</span><span class="cx">
</span><span class="cx"> // No user to check
</span><del>- if ( empty( $user_id ) )
</del><ins>+ if ( empty( $user_id ) ) {
</ins><span class="cx"> return false;
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> $bp = buddypress();
</span><span class="cx">
</span><span class="lines">@@ -837,12 +850,13 @@
</span><span class="cx"> } else {
</span><span class="cx">
</span><span class="cx"> // Check if deleted
</span><del>- if ( !empty( $user->deleted ) )
</del><ins>+ if ( !empty( $user->deleted ) ) {
</ins><span class="cx"> $is_deleted = true;
</span><ins>+ }
</ins><span class="cx">
</span><del>- if ( 2 == $user->user_status )
</del><ins>+ if ( 2 == $user->user_status ) {
</ins><span class="cx"> $is_deleted = true;
</span><del>-
</del><ins>+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return apply_filters( 'bp_is_user_deleted', (bool) $is_deleted );
</span><span class="lines">@@ -864,20 +878,24 @@
</span><span class="cx"> function bp_is_user_active( $user_id = 0 ) {
</span><span class="cx">
</span><span class="cx"> // Default to current user
</span><del>- if ( empty( $user_id ) && is_user_logged_in() )
</del><ins>+ if ( empty( $user_id ) && is_user_logged_in() ) {
</ins><span class="cx"> $user_id = bp_loggedin_user_id();
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // No user to check
</span><del>- if ( empty( $user_id ) )
</del><ins>+ if ( empty( $user_id ) ) {
</ins><span class="cx"> return false;
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // Check spam
</span><del>- if ( bp_is_user_spammer( $user_id ) )
</del><ins>+ if ( bp_is_user_spammer( $user_id ) ) {
</ins><span class="cx"> return false;
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // Check deleted
</span><del>- if ( bp_is_user_deleted( $user_id ) )
</del><ins>+ if ( bp_is_user_deleted( $user_id ) ) {
</ins><span class="cx"> return false;
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // Assume true if not spam or deleted
</span><span class="cx"> return true;
</span><span class="lines">@@ -901,12 +919,14 @@
</span><span class="cx"> function bp_is_user_inactive( $user_id = 0 ) {
</span><span class="cx">
</span><span class="cx"> // Default to current user
</span><del>- if ( empty( $user_id ) && is_user_logged_in() )
</del><ins>+ if ( empty( $user_id ) && is_user_logged_in() ) {
</ins><span class="cx"> $user_id = bp_loggedin_user_id();
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // No user to check
</span><del>- if ( empty( $user_id ) )
</del><ins>+ if ( empty( $user_id ) ) {
</ins><span class="cx"> return false;
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // Return the inverse of active
</span><span class="cx"> return !bp_is_user_active( $user_id );
</span><span class="lines">@@ -922,6 +942,7 @@
</span><span class="cx"> * @return bool True on success, false on failure.
</span><span class="cx"> */
</span><span class="cx"> function bp_update_user_last_activity( $user_id = 0, $time = '' ) {
</span><ins>+
</ins><span class="cx"> // Fall back on current user
</span><span class="cx"> if ( empty( $user_id ) ) {
</span><span class="cx"> $user_id = bp_loggedin_user_id();
</span><span class="lines">@@ -1066,8 +1087,9 @@
</span><span class="cx"> function bp_core_get_all_posts_for_user( $user_id = 0 ) {
</span><span class="cx"> global $wpdb;
</span><span class="cx">
</span><del>- if ( empty( $user_id ) )
</del><ins>+ if ( empty( $user_id ) ) {
</ins><span class="cx"> $user_id = bp_displayed_user_id();
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> return apply_filters( 'bp_core_get_all_posts_for_user', $wpdb->get_col( $wpdb->prepare( "SELECT ID FROM {$wpdb->posts} WHERE post_author = %d AND post_status = 'publish' AND post_type = 'post'", $user_id ) ) );
</span><span class="cx"> }
</span><span class="lines">@@ -1084,12 +1106,14 @@
</span><span class="cx"> function bp_core_delete_account( $user_id = 0 ) {
</span><span class="cx">
</span><span class="cx"> // Use logged in user ID if none is passed
</span><del>- if ( empty( $user_id ) )
</del><ins>+ if ( empty( $user_id ) ) {
</ins><span class="cx"> $user_id = bp_loggedin_user_id();
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // Site admins cannot be deleted
</span><del>- if ( is_super_admin( $user_id ) )
</del><ins>+ if ( is_super_admin( $user_id ) ) {
</ins><span class="cx"> return false;
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // Extra checks if user is not deleting themselves
</span><span class="cx"> if ( bp_loggedin_user_id() !== absint( $user_id ) ) {
</span><span class="lines">@@ -1173,14 +1197,17 @@
</span><span class="cx"> * object. Otherwise a new WP_Error object.
</span><span class="cx"> */
</span><span class="cx"> function bp_core_boot_spammer( $user ) {
</span><ins>+
</ins><span class="cx"> // check to see if the $user has already failed logging in, if so return $user as-is
</span><del>- if ( is_wp_error( $user ) || empty( $user ) )
</del><ins>+ if ( is_wp_error( $user ) || empty( $user ) ) {
</ins><span class="cx"> return $user;
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // the user exists; now do a check to see if the user is a spammer
</span><span class="cx"> // if the user is a spammer, stop them in their tracks!
</span><del>- if ( is_a( $user, 'WP_User' ) && ( ( is_multisite() && (int) $user->spam ) || 1 == $user->user_status ) )
</del><ins>+ if ( is_a( $user, 'WP_User' ) && ( ( is_multisite() && (int) $user->spam ) || 1 == $user->user_status ) ) {
</ins><span class="cx"> return new WP_Error( 'invalid_username', __( '<strong>ERROR</strong>: Your account has been marked as a spammer.', 'buddypress' ) );
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // user is good to go!
</span><span class="cx"> return $user;
</span><span class="lines">@@ -1210,15 +1237,17 @@
</span><span class="cx"> * @return bool True if editing is allowed, otherwise false.
</span><span class="cx"> */
</span><span class="cx"> function bp_core_can_edit_settings() {
</span><del>- if ( bp_is_my_profile() )
</del><ins>+ if ( bp_is_my_profile() ) {
</ins><span class="cx"> return true;
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> if ( is_super_admin( bp_displayed_user_id() ) && ! is_super_admin() ) {
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( bp_current_user_can( 'bp_moderate' ) || current_user_can( 'edit_users' ) )
</del><ins>+ if ( bp_current_user_can( 'bp_moderate' ) || current_user_can( 'edit_users' ) ) {
</ins><span class="cx"> return true;
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="lines">@@ -1325,13 +1354,15 @@
</span><span class="cx"> $user_email = sanitize_email( $user_email );
</span><span class="cx">
</span><span class="cx"> // Is the email well-formed?
</span><del>- if ( ! is_email( $user_email ) )
</del><ins>+ if ( ! is_email( $user_email ) ) {
</ins><span class="cx"> $errors['invalid'] = 1;
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // Is the email on the Banned Email Domains list?
</span><span class="cx"> // Note: This check only works on Multisite
</span><del>- if ( function_exists( 'is_email_address_unsafe' ) && is_email_address_unsafe( $user_email ) )
</del><ins>+ if ( function_exists( 'is_email_address_unsafe' ) && is_email_address_unsafe( $user_email ) ) {
</ins><span class="cx"> $errors['domain_banned'] = 1;
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // Is the email on the Limited Email Domains list?
</span><span class="cx"> // Note: This check only works on Multisite
</span><span class="lines">@@ -1344,8 +1375,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Is the email alreday in use?
</span><del>- if ( email_exists( $user_email ) )
</del><ins>+ if ( email_exists( $user_email ) ) {
</ins><span class="cx"> $errors['in_use'] = 1;
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> $retval = ! empty( $errors ) ? $errors : true;
</span><span class="cx">
</span><span class="lines">@@ -1368,17 +1400,21 @@
</span><span class="cx"> * like bp_core_validate_email_address().
</span><span class="cx"> */
</span><span class="cx"> function bp_core_add_validation_error_messages( WP_Error $errors, $validation_results ) {
</span><del>- if ( ! empty( $validation_results['invalid'] ) )
</del><ins>+ if ( ! empty( $validation_results['invalid'] ) ) {
</ins><span class="cx"> $errors->add( 'user_email', __( 'Please check your email address.', 'buddypress' ) );
</span><ins>+ }
</ins><span class="cx">
</span><del>- if ( ! empty( $validation_results['domain_banned'] ) )
</del><ins>+ if ( ! empty( $validation_results['domain_banned'] ) ) {
</ins><span class="cx"> $errors->add( 'user_email', __( 'Sorry, that email address is not allowed!', 'buddypress' ) );
</span><ins>+ }
</ins><span class="cx">
</span><del>- if ( ! empty( $validation_results['domain_not_allowed'] ) )
</del><ins>+ if ( ! empty( $validation_results['domain_not_allowed'] ) ) {
</ins><span class="cx"> $errors->add( 'user_email', __( 'Sorry, that email address is not allowed!', 'buddypress' ) );
</span><ins>+ }
</ins><span class="cx">
</span><del>- if ( ! empty( $validation_results['in_use'] ) )
</del><ins>+ if ( ! empty( $validation_results['in_use'] ) ) {
</ins><span class="cx"> $errors->add( 'user_email', __( 'Sorry, that email address is already used!', 'buddypress' ) );
</span><ins>+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -1481,8 +1517,9 @@
</span><span class="cx"> * @return array
</span><span class="cx"> */
</span><span class="cx"> function bp_core_validate_blog_signup( $blog_url, $blog_title ) {
</span><del>- if ( !is_multisite() || !function_exists( 'wpmu_validate_blog_signup' ) )
</del><ins>+ if ( ! is_multisite() || ! function_exists( 'wpmu_validate_blog_signup' ) ) {
</ins><span class="cx"> return false;
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> return apply_filters( 'bp_core_validate_blog_signup', wpmu_validate_blog_signup( $blog_url, $blog_title ) );
</span><span class="cx"> }
</span><span class="lines">@@ -1500,7 +1537,7 @@
</span><span class="cx"> * @return bool|WP_Error True on success, WP_Error on failure.
</span><span class="cx"> */
</span><span class="cx"> function bp_core_signup_user( $user_login, $user_password, $user_email, $usermeta ) {
</span><del>- global $bp;
</del><ins>+ $bp = buddypress();
</ins><span class="cx">
</span><span class="cx"> // We need to cast $user_id to pass to the filters
</span><span class="cx"> $user_id = false;
</span><span class="lines">@@ -1571,8 +1608,9 @@
</span><span class="cx"> * @param string $usermeta Miscellaneous metadata for the user.
</span><span class="cx"> */
</span><span class="cx"> function bp_core_signup_blog( $blog_domain, $blog_path, $blog_title, $user_name, $user_email, $usermeta ) {
</span><del>- if ( !is_multisite() || !function_exists( 'wpmu_signup_blog' ) )
</del><ins>+ if ( ! is_multisite() || ! function_exists( 'wpmu_signup_blog' ) ) {
</ins><span class="cx"> return false;
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> return apply_filters( 'bp_core_signup_blog', wpmu_signup_blog( $blog_domain, $blog_path, $blog_title, $user_name, $user_email, $usermeta ) );
</span><span class="cx"> }
</span><span class="lines">@@ -1688,8 +1726,9 @@
</span><span class="cx"> foreach( (array) $profile_field_ids as $field_id ) {
</span><span class="cx"> $current_field = isset( $user['meta']["field_{$field_id}"] ) ? $user['meta']["field_{$field_id}"] : false;
</span><span class="cx">
</span><del>- if ( !empty( $current_field ) )
</del><ins>+ if ( !empty( $current_field ) ) {
</ins><span class="cx"> xprofile_set_field_data( $field_id, $user_id, $current_field );
</span><ins>+ }
</ins><span class="cx">
</span><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="lines">@@ -1801,19 +1840,20 @@
</span><span class="cx"> * @param array $user Array of userdata passed to bp_core_activated_user hook.
</span><span class="cx"> */
</span><span class="cx"> function bp_core_new_user_activity( $user ) {
</span><del>- if ( empty( $user ) || !bp_is_active( 'activity' ) )
</del><ins>+ if ( empty( $user ) || ! bp_is_active( 'activity' ) ) {
</ins><span class="cx"> return false;
</span><ins>+ }
</ins><span class="cx">
</span><del>- if ( is_array( $user ) )
</del><ins>+ if ( is_array( $user ) ) {
</ins><span class="cx"> $user_id = $user['user_id'];
</span><del>- else
</del><ins>+ } else {
</ins><span class="cx"> $user_id = $user;
</span><ins>+ }
</ins><span class="cx">
</span><del>- if ( empty( $user_id ) )
</del><ins>+ if ( empty( $user_id ) ) {
</ins><span class="cx"> return false;
</span><ins>+ }
</ins><span class="cx">
</span><del>- $userlink = bp_core_get_userlink( $user_id );
-
</del><span class="cx"> bp_activity_add( array(
</span><span class="cx"> 'user_id' => $user_id,
</span><span class="cx"> 'component' => 'xprofile',
</span><span class="lines">@@ -1833,8 +1873,9 @@
</span><span class="cx"> function bp_core_map_user_registration( $user_id ) {
</span><span class="cx">
</span><span class="cx"> // Only map data when the site admin is adding users, not on registration.
</span><del>- if ( !is_admin() )
</del><ins>+ if ( ! is_admin() ) {
</ins><span class="cx"> return false;
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> // Add the user's fullname to Xprofile
</span><span class="cx"> if ( bp_is_active( 'xprofile' ) ) {
</span><span class="lines">@@ -1842,8 +1883,9 @@
</span><span class="cx"> $lastname = ' ' . bp_get_user_meta( $user_id, 'last_name', true );
</span><span class="cx"> $name = $firstname . $lastname;
</span><span class="cx">
</span><del>- if ( empty( $name ) || ' ' == $name )
</del><ins>+ if ( empty( $name ) || ' ' == $name ) {
</ins><span class="cx"> $name = bp_get_user_meta( $user_id, 'nickname', true );
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> xprofile_set_field_data( 1, $user_id, $name );
</span><span class="cx"> }
</span><span class="lines">@@ -1856,22 +1898,31 @@
</span><span class="cx"> * @return string|bool Directory path on success, false on failure.
</span><span class="cx"> */
</span><span class="cx"> function bp_core_signup_avatar_upload_dir() {
</span><del>- global $bp;
</del><ins>+ $bp = buddypress();
</ins><span class="cx">
</span><del>- if ( !$bp->signup->avatar_dir )
</del><ins>+ if ( empty( $bp->signup->avatar_dir ) ) {
</ins><span class="cx"> return false;
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> $path = bp_core_avatar_upload_path() . '/avatars/signups/' . $bp->signup->avatar_dir;
</span><span class="cx"> $newbdir = $path;
</span><span class="cx">
</span><del>- if ( !file_exists( $path ) )
</del><ins>+ if ( ! file_exists( $path ) ) {
</ins><span class="cx"> @wp_mkdir_p( $path );
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> $newurl = bp_core_avatar_url() . '/avatars/signups/' . $bp->signup->avatar_dir;
</span><span class="cx"> $newburl = $newurl;
</span><span class="cx"> $newsubdir = '/avatars/signups/' . $bp->signup->avatar_dir;
</span><span class="cx">
</span><del>- return apply_filters( 'bp_core_signup_avatar_upload_dir', array( 'path' => $path, 'url' => $newurl, 'subdir' => $newsubdir, 'basedir' => $newbdir, 'baseurl' => $newburl, 'error' => false ) );
</del><ins>+ return apply_filters( 'bp_core_signup_avatar_upload_dir', array(
+ 'path' => $path,
+ 'url' => $newurl,
+ 'subdir' => $newsubdir,
+ 'basedir' => $newbdir,
+ 'baseurl' => $newburl,
+ 'error' => false
+ ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -1998,14 +2049,16 @@
</span><span class="cx"> function bp_core_wpsignup_redirect() {
</span><span class="cx">
</span><span class="cx"> // Bail in admin or if custom signup page is broken
</span><del>- if ( is_admin() || ! bp_has_custom_signup_page() )
</del><ins>+ if ( is_admin() || ! bp_has_custom_signup_page() ) {
</ins><span class="cx"> return;
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> $action = !empty( $_GET['action'] ) ? $_GET['action'] : '';
</span><span class="cx">
</span><span class="cx"> // Not at the WP core signup page and action is not register
</span><del>- if ( ! empty( $_SERVER['SCRIPT_NAME'] ) && false === strpos( $_SERVER['SCRIPT_NAME'], 'wp-signup.php' ) && ( 'register' != $action ) )
</del><ins>+ if ( ! empty( $_SERVER['SCRIPT_NAME'] ) && false === strpos( $_SERVER['SCRIPT_NAME'], 'wp-signup.php' ) && ( 'register' != $action ) ) {
</ins><span class="cx"> return;
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> bp_core_redirect( bp_get_signup_page() );
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>