<!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][5832] trunk/bp-settings/bp-settings-actions.php: Tweak general settings logic to include boolean for successfully changed email address.</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/5832">5832</a></dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2012-02-23 07:27:29 +0000 (Thu, 23 Feb 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Tweak general settings logic to include boolean for successfully changed email address. See <a href="http://buddypress.trac.wordpress.org/ticket/4038">#4038</a>, <a href="http://buddypress.trac.wordpress.org/ticket/4010">#4010</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpsettingsbpsettingsactionsphp">trunk/bp-settings/bp-settings-actions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpsettingsbpsettingsactionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-settings/bp-settings-actions.php (5831 => 5832)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-settings/bp-settings-actions.php 2012-02-23 07:19:16 UTC (rev 5831)
+++ trunk/bp-settings/bp-settings-actions.php 2012-02-23 07:27:29 UTC (rev 5832)
</span><span class="lines">@@ -46,10 +46,10 @@
</span><span class="cx"> $email_error = false; // invalid|blocked|taken|empty|nochange
</span><span class="cx"> $pass_error = false; // invalid|mismatch|empty|nochange
</span><span class="cx"> $pass_changed = false; // true if the user changes their password
</span><ins>+ $email_changed = false; // true if the user changes their email
</ins><span class="cx"> $feedback_type = 'error'; // success|error
</span><span class="cx"> $feedback = array(); // array of strings for feedback
</span><span class="cx">
</span><del>- /** Handle Form ***********************************************************/
</del><span class="cx">
</span><span class="cx"> if ( isset( $_POST['submit'] ) ) {
</span><span class="cx">
</span><span class="lines">@@ -68,7 +68,7 @@
</span><span class="cx"> // What is missing from the profile page vs signup - lets double check the goodies
</span><span class="cx"> $user_email = sanitize_email( esc_html( trim( $_POST['email'] ) ) );
</span><span class="cx">
</span><del>- // Skip this if no change to email
</del><ins>+ // User is changing email address
</ins><span class="cx"> if ( $bp->displayed_user->userdata->user_email != $user_email ) {
</span><span class="cx">
</span><span class="cx"> // Is email valid
</span><span class="lines">@@ -92,16 +92,17 @@
</span><span class="cx"> $email_error = 'taken';
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ // Yay we made it!
+ if ( false === $email_error ) {
+ $update_user->user_email = $user_email;
+ $email_changed = true;
+ }
+
</ins><span class="cx"> // No change
</span><span class="cx"> } else {
</span><del>- $email_error = 'nochange';
</del><ins>+ $email_error = false;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- // Yay we made it!
- if ( false === $email_error ) {
- $update_user->user_email = $user_email;
- }
-
</del><span class="cx"> // Email address cannot be empty
</span><span class="cx"> } else {
</span><span class="cx"> $email_error = 'empty';
</span><span class="lines">@@ -123,7 +124,7 @@
</span><span class="cx">
</span><span class="cx"> // Both password fields were empty
</span><span class="cx"> } elseif ( empty( $_POST['pass1'] ) && empty( $_POST['pass2'] ) ) {
</span><del>- $pass_error = 'nochange';
</del><ins>+ $pass_error = false;
</ins><span class="cx">
</span><span class="cx"> // One of the password boxes was left empty
</span><span class="cx"> } elseif ( ( empty( $_POST['pass1'] ) && !empty( $_POST['pass2'] ) ) || ( !empty( $_POST['pass1'] ) && empty( $_POST['pass2'] ) ) ) {
</span><span class="lines">@@ -168,8 +169,8 @@
</span><span class="cx"> case 'empty' :
</span><span class="cx"> $feedback['email_empty'] = __( 'Email address cannot be empty.', 'buddypress' );
</span><span class="cx"> break;
</span><del>- case 'nochange' :
- $email_error = false;
</del><ins>+ case false :
+ // No change
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -184,18 +185,18 @@
</span><span class="cx"> case 'empty' :
</span><span class="cx"> $feedback['pass_empty'] = __( 'One of the password fields was empty.', 'buddypress' );
</span><span class="cx"> break;
</span><del>- case 'nochange' :
- $pass_error = false;
</del><ins>+ case false :
+ // No change
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // No errors so show a simple success message
</span><del>- if ( ( false === $email_error ) && ( ( false == $pass_error ) && ( true === $pass_changed ) ) ) {
</del><ins>+ if ( ( ( false === $email_error ) || ( false == $pass_error ) ) && ( ( true === $pass_changed ) || ( true === $email_changed ) ) ) {
</ins><span class="cx"> $feedback[] = __( 'Your settings have been saved.', 'buddypress' );
</span><span class="cx"> $feedback_type = 'success';
</span><span class="cx">
</span><span class="cx"> // Some kind of errors occurred
</span><del>- } elseif ( ( false === $email_error ) && ( ( false == $pass_error ) && ( false === $pass_changed ) ) ) {
</del><ins>+ } elseif ( ( ( false === $email_error ) || ( false === $pass_error ) ) && ( ( false === $pass_changed ) || ( false === $email_changed ) ) ) {
</ins><span class="cx"> if ( bp_is_my_profile() ) {
</span><span class="cx"> $feedback['nochange'] = __( 'No changes were made to your account.', 'buddypress' );
</span><span class="cx"> } else {
</span></span></pre>
</div>
</div>
</body>
</html>