<!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][5631] branches/1.5/bp-settings/bp-settings-actions.php: Cast WP_User object into an array for wp_update_user() early enough for the user_pass field to be unset when passwords are not being changed, in General Settings.</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/5631">5631</a></dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2012-01-10 20:51:31 +0000 (Tue, 10 Jan 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Cast WP_User object into an array for wp_update_user() early enough for the user_pass field to be unset when passwords are not being changed, in General Settings. Implements a redirect after changing settings, for more reliable display of updated information. Fixes <a href="http://buddypress.trac.wordpress.org/ticket/3918">#3918</a>. Props blindMoe, luccame, johnjamesjacoby for help with patching and testing.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches15bpsettingsbpsettingsactionsphp">branches/1.5/bp-settings/bp-settings-actions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches15bpsettingsbpsettingsactionsphp"></a>
<div class="modfile"><h4>Modified: branches/1.5/bp-settings/bp-settings-actions.php (5630 => 5631)</h4>
<pre class="diff"><span>
<span class="info">--- branches/1.5/bp-settings/bp-settings-actions.php 2012-01-10 17:57:24 UTC (rev 5630)
+++ branches/1.5/bp-settings/bp-settings-actions.php 2012-01-10 20:51:31 UTC (rev 5631)
</span><span class="lines">@@ -24,6 +24,12 @@
</span><span class="cx"> if ( is_super_admin() || ( !empty( $_POST['pwd'] ) && $_POST['pwd'] != '' && wp_check_password( $_POST['pwd'], $bp->displayed_user->userdata->user_pass, $bp->displayed_user->id ) ) ) {
</span><span class="cx">
</span><span class="cx"> $update_user = get_userdata( $bp->displayed_user->id );
</span><ins>+
+ // The structure of the $update_user object changed in WP 3.3, but
+ // wp_update_user() still expects the old format
+ if ( isset( $update_user->data ) && is_object( $update_user->data ) ) {
+ $update_user = $update_user->data;
+ }
</ins><span class="cx">
</span><span class="cx"> // Make sure changing an email address does not already exist
</span><span class="cx"> if ( $_POST['email'] != '' ) {
</span><span class="lines">@@ -80,15 +86,8 @@
</span><span class="cx"> unset( $update_user->user_pass );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // The structure of the $update_user object changed in WP 3.3, but
- // wp_update_user() still expects the old format
- if ( isset( $update_user->data ) && is_object( $update_user->data ) ) {
- $update_user = $update_user->data;
- }
-
</del><span class="cx"> // Make sure these changes are in $bp for the current page load
</span><span class="cx"> if ( ( false === $email_error ) && ( false === $pass_error ) && ( wp_update_user( get_object_vars( $update_user ) ) ) ) {
</span><del>- $bp->displayed_user->userdata = bp_core_get_core_userdata( $bp->displayed_user->id );
</del><span class="cx"> $bp_settings_updated = true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -112,6 +111,8 @@
</span><span class="cx">
</span><span class="cx"> // Execute additional code
</span><span class="cx"> do_action( 'bp_core_general_settings_after_save' );
</span><ins>+
+ bp_core_redirect( trailingslashit( bp_displayed_user_domain() . bp_get_settings_slug() . '/general' ) );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Load the template
</span></span></pre>
</div>
</div>
</body>
</html>