<!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][13031] branches/9.0/src/bp-settings/actions/general.php: Settings: Make sure changing pwd from the General Screen encrypts it</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 { white-space: pre-line; 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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://buddypress.trac.wordpress.org/changeset/13031">13031</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://buddypress.trac.wordpress.org/changeset/13031","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>imath</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2021-08-04 20:29:17 +0000 (Wed, 04 Aug 2021)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Settings: Make sure changing pwd from the General Screen encrypts it
Using a WP_User object to set the password to update was misleading WordPress `wp_update_user()` function. The new password was interpreted as the current password and was not encrypted.
Passing a regular array to the `wp_update_user()` function avoids the risk of messing with WP User object cache.
Props mandro
See <a href="http://buddypress.trac.wordpress.org/ticket/8539">#8539</a> (branch 9.0)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches90srcbpsettingsactionsgeneralphp">branches/9.0/src/bp-settings/actions/general.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches90srcbpsettingsactionsgeneralphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/9.0/src/bp-settings/actions/general.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/9.0/src/bp-settings/actions/general.php 2021-08-04 19:19:37 UTC (rev 13030)
+++ branches/9.0/src/bp-settings/actions/general.php 2021-08-04 20:29:17 UTC (rev 13031)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -58,11 +58,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Validate the user again for the current password when making a big change.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ( is_super_admin() ) || ( !empty( $_POST['pwd'] ) && wp_check_password( $_POST['pwd'], $bp->displayed_user->userdata->user_pass, bp_displayed_user_id() ) ) ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $update_user = get_userdata( bp_displayed_user_id() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $update_user = array(
+ 'ID' => (int) bp_displayed_user_id(),
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /* Email Change Attempt ******************************************/
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( !empty( $_POST['email'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $_POST['email'] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // What is missing from the profile page vs signup -
</span><span class="cx" style="display: block; padding: 0 10px"> // let's double check the goodies.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -70,7 +72,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $old_user_email = $bp->displayed_user->userdata->user_email;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // User is changing email address.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $old_user_email != $user_email ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $old_user_email !== $user_email ) {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Run some tests on the email address.
</span><span class="cx" style="display: block; padding: 0 10px"> $email_checks = bp_core_validate_email_address( $user_email );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -114,7 +116,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // We mark that the change has taken place so as to ensure a
</span><span class="cx" style="display: block; padding: 0 10px"> // success message, even though verification is still required.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $_POST['email'] = $update_user->user_email;
</del><span class="cx" style="display: block; padding: 0 10px"> $email_changed = true;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -138,9 +139,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $pass_error->get_error_message() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Password change attempt is successful.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ( ! empty( $_POST['pwd'] ) && wp_unslash( $_POST['pwd'] ) !== $pass ) || is_super_admin() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $update_user->user_pass = $_POST['pass1'];
- $pass_error = false;
- $pass_changed = true;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $update_user['user_pass'] = $_POST['pass1'];
+ $pass_error = false;
+ $pass_changed = true;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // The new password is the same as the current password.
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -157,18 +158,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $pass_error = new WP_Error( 'empty_user_password', __( 'One of the password fields was empty.', 'buddypress' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // 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;
- $update_user = get_object_vars( $update_user );
-
- // Unset the password field to prevent it from emptying out the
- // user's user_pass field in the database.
- // @see wp_update_user().
- if ( false === $pass_changed ) {
- unset( $update_user['user_pass'] );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Unset the password field to prevent it from emptying out the
+ // user's user_pass field in the database.
+ if ( false === $pass_changed ) {
+ unset( $update_user['user_pass'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Clear cached data, so that the changed settings take effect
</span></span></pre>
</div>
</div>
</body>
</html>