<!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][13292] trunk/src/bp-settings/actions/general.php: Pass the user ID inside the hook fired after settings are saved</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/13292">13292</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/13292","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>2022-07-06 09:56:46 +0000 (Wed, 06 Jul 2022)</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'>Pass the user ID inside the hook fired after settings are saved
This is a reply to a request made in the BuddyPress support forum. See
[https://buddypress.org/support/topic/suggestion-pass-user_id-to-bp_core_general_settings_after_save/
this topic] for more information about it.
Props alexmangini, oztaser, espellcaste.
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/8631">#8631</a>
--Cette ligne, et les suivantes
ci-dessous, seront ignorees--
M src/bp-settings/actions/general.php</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpsettingsactionsgeneralphp">trunk/src/bp-settings/actions/general.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpsettingsactionsgeneralphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-settings/actions/general.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-settings/actions/general.php 2022-07-06 09:35:00 UTC (rev 13291)
+++ trunk/src/bp-settings/actions/general.php 2022-07-06 09:56:46 UTC (rev 13292)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -44,22 +44,23 @@
</span><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"> // Define local defaults
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $bp = buddypress(); // The instance
- $email_error = false; // invalid|blocked|taken|empty|nochange
- $pass_error = false; // invalid|mismatch|empty|nochange
- $pass_changed = false; // true if the user changes their password
- $email_changed = false; // true if the user changes their email
- $feedback_type = 'error'; // success|error
- $feedback = array(); // array of strings for feedback.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $bp = buddypress(); // The instance
+ $email_error = false; // invalid|blocked|taken|empty|nochange
+ $pass_error = false; // invalid|mismatch|empty|nochange
+ $pass_changed = false; // true if the user changes their password
+ $email_changed = false; // true if the user changes their email
+ $feedback_type = 'error'; // success|error
+ $feedback = array(); // array of strings for feedback.
+ $user_id = bp_displayed_user_id(); // The ID of the user being displayed.
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Nonce check.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- check_admin_referer('bp_settings_general');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ check_admin_referer( 'bp_settings_general' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Validate the user again for the current password when making a big change.
</span><del style="background-color: #fdd; text-decoration:none; 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() ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ( is_super_admin() ) || ( ! empty( $_POST['pwd'] ) && wp_check_password( $_POST['pwd'], $bp->displayed_user->userdata->user_pass, $user_id ) ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $update_user = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'ID' => (int) bp_displayed_user_id(),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'ID' => (int) $user_id,
</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"> /* Email Change Attempt ******************************************/
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -99,13 +100,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'newemail' => $user_email,
</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">- bp_update_user_meta( bp_displayed_user_id(), 'pending_email_change', $pending_email );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ bp_update_user_meta( $user_id, 'pending_email_change', $pending_email );
</ins><span class="cx" style="display: block; padding: 0 10px"> $verify_link = bp_displayed_user_domain() . bp_get_settings_slug() . '/?verify_email_change=' . $hash;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Send the verification email.
</span><span class="cx" style="display: block; padding: 0 10px"> $args = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'tokens' => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'displayname' => bp_core_get_user_displayname( bp_displayed_user_id() ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'displayname' => bp_core_get_user_displayname( $user_id ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'old-user.email' => $old_user_email,
</span><span class="cx" style="display: block; padding: 0 10px"> 'user.email' => $user_email,
</span><span class="cx" style="display: block; padding: 0 10px"> 'verify.url' => esc_url( $verify_link ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -181,7 +182,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Clear cached data, so that the changed settings take effect
</span><span class="cx" style="display: block; padding: 0 10px"> // on the current page load.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ( false === $email_error ) && ( false === $pass_error ) && ( wp_update_user( $update_user ) ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $bp->displayed_user->userdata = bp_core_get_core_userdata( bp_displayed_user_id() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $bp->displayed_user->userdata = bp_core_get_core_userdata( $user_id );
</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"> // Password Error.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -226,18 +227,25 @@
</span><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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Set the feedback.
- bp_core_add_message( implode( "\n", $feedback ), $feedback_type );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Set the URL to redirect the user to.
+ $redirect_to = trailingslashit( bp_displayed_user_domain() . bp_get_settings_slug() . '/general' );
</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"> * Fires after the general settings have been saved, and before redirect.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.5.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 11.0.0 Add the `$user_id` & `$redirect_to` parameters.
+ *
+ * @param int $user_id The ID of the user being displayed.
+ * @param string $redirect_to The Default Front-end General Settings Screen URL.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- do_action( 'bp_core_general_settings_after_save' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ do_action( 'bp_core_general_settings_after_save', $user_id, $redirect_to );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Set the feedback.
+ bp_core_add_message( implode( "\n", $feedback ), $feedback_type );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Redirect to prevent issues with browser back button.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- bp_core_redirect( trailingslashit( bp_displayed_user_domain() . bp_get_settings_slug() . '/general' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ bp_core_redirect( $redirect_to );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'bp_actions', 'bp_settings_action_general' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre>
</div>
</div>
</body>
</html>