<!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] [2818] branches/1.2: Fixes #2097, #2114</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>2818</dd>
<dt>Author</dt> <dd>apeatling</dd>
<dt>Date</dt> <dd>2010-03-08 15:28:57 +0000 (Mon, 08 Mar 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fixes #2097, #2114</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches12bpcorebpcoresignupphp">branches/1.2/bp-core/bp-core-signup.php</a></li>
<li><a href="#branches12bpgroupsphp">branches/1.2/bp-groups.php</a></li>
<li><a href="#branches12bpxprofilephp">branches/1.2/bp-xprofile.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches12bpcorebpcoresignupphp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-core/bp-core-signup.php (2817 => 2818)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-core/bp-core-signup.php 2010-03-08 15:20:50 UTC (rev 2817)
+++ branches/1.2/bp-core/bp-core-signup.php 2010-03-08 15:28:57 UTC (rev 2818)
</span><span class="lines">@@ -234,6 +234,8 @@
</span><span class="cx">
</span><span class="cx"> $bp->signup->username = $user_login;
</span><span class="cx">
</span><ins>+ do_action( 'bp_core_signup_user', $user_id, $user_login, $user_password, $user_email, $usermeta );
+
</ins><span class="cx"> return $user_id;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branches12bpgroupsphp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-groups.php (2817 => 2818)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-groups.php 2010-03-08 15:20:50 UTC (rev 2817)
+++ branches/1.2/bp-groups.php 2010-03-08 15:28:57 UTC (rev 2818)
</span><span class="lines">@@ -1544,6 +1544,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ groups_update_groupmeta( $group->id, 'last_activity', gmdate( "Y-m-d H:i:s" ) );
</ins><span class="cx"> do_action( 'groups_settings_updated', $group->id );
</span><span class="cx">
</span><span class="cx"> return true;
</span></span></pre></div>
<a id="branches12bpxprofilephp"></a>
<div class="modfile"><h4>Modified: branches/1.2/bp-xprofile.php (2817 => 2818)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.2/bp-xprofile.php 2010-03-08 15:20:50 UTC (rev 2817)
+++ branches/1.2/bp-xprofile.php 2010-03-08 15:28:57 UTC (rev 2818)
</span><span class="lines">@@ -887,13 +887,19 @@
</span><span class="cx"> *
</span><span class="cx"> * @package BuddyPress Core
</span><span class="cx"> */
</span><del>-function xprofile_sync_wp_profile() {
</del><ins>+function xprofile_sync_wp_profile( $user_id = false ) {
</ins><span class="cx"> global $bp, $wpdb;
</span><span class="cx">
</span><span class="cx"> if ( (int)$bp->site_options['bp-disable-profile-sync'] )
</span><span class="cx"> return true;
</span><span class="cx">
</span><del>- $fullname = xprofile_get_field_data( BP_XPROFILE_FULLNAME_FIELD_NAME, $bp->loggedin_user->id );
</del><ins>+ if ( empty( $user_id ) )
+ $user_id = $bp->loggedin_user->id;
+
+ if ( empty( $user_id ) )
+ return false;
+
+ $fullname = xprofile_get_field_data( BP_XPROFILE_FULLNAME_FIELD_NAME, $user_id );
</ins><span class="cx"> $space = strpos( $fullname, ' ' );
</span><span class="cx">
</span><span class="cx"> if ( false === $space ) {
</span><span class="lines">@@ -904,16 +910,16 @@
</span><span class="cx"> $lastname = trim( substr( $fullname, $space, strlen($fullname) ) );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- update_usermeta( $bp->loggedin_user->id, 'nickname', $fullname );
- update_usermeta( $bp->loggedin_user->id, 'first_name', $firstname );
- update_usermeta( $bp->loggedin_user->id, 'last_name', $lastname );
</del><ins>+ update_usermeta( $user_id, 'nickname', $fullname );
+ update_usermeta( $user_id, 'first_name', $firstname );
+ update_usermeta( $user_id, 'last_name', $lastname );
</ins><span class="cx">
</span><del>- $wpdb->query( $wpdb->prepare( "UPDATE {$wpdb->users} SET display_name = %s WHERE ID = %d", $fullname, $bp->loggedin_user->id ) );
- $wpdb->query( $wpdb->prepare( "UPDATE {$wpdb->users} SET user_url = %s WHERE ID = %d", bp_core_get_user_domain( $bp->loggedin_user->id ), $bp->loggedin_user->id ) );
</del><ins>+ $wpdb->query( $wpdb->prepare( "UPDATE {$wpdb->users} SET display_name = %s WHERE ID = %d", $fullname, $user_id ) );
+ $wpdb->query( $wpdb->prepare( "UPDATE {$wpdb->users} SET user_url = %s WHERE ID = %d", bp_core_get_user_domain( $user_id ), $user_id ) );
</ins><span class="cx"> }
</span><span class="cx"> add_action( 'xprofile_updated_profile', 'xprofile_sync_wp_profile' );
</span><ins>+add_action( 'bp_core_signup_user', 'xprofile_sync_wp_profile' );
</ins><span class="cx">
</span><del>-
</del><span class="cx"> /**
</span><span class="cx"> * xprofile_remove_screen_notifications()
</span><span class="cx"> *
</span></span></pre>
</div>
</div>
</body>
</html>