
<!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>[14802] trunk/wp-admin/user-edit.php:

  Allow users to cancel email address changes.</title>

</head>

<body>


<div id="msg">

<dl>

<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/14802">14802</a></dd>

<dt>Author</dt> <dd>westi</dd>

<dt>Date</dt> <dd>2010-05-22 07:53:59 +0000 (Sat, 22 May 2010)</dd>

</dl>


<h3>Log Message</h3>

<pre>Allow users to cancel email address changes. Fixes <a href="http://trac.wordpress.org/ticket/13457">#13457</a> props mtdewvirus.</pre>


<h3>Modified Paths</h3>

<ul>

<li><a href="#trunkwpadminusereditphp">trunk/wp-admin/user-edit.php</a></li>

</ul>


</div>

<div id="patch">

<h3>Diff</h3>

<a id="trunkwpadminusereditphp"></a>

<div class="modfile"><h4>Modified: trunk/wp-admin/user-edit.php (14801 => 14802)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/wp-admin/user-edit.php        2010-05-22 05:40:29 UTC (rev 14801)

+++ trunk/wp-admin/user-edit.php        2010-05-22 07:53:59 UTC (rev 14802)

</span><span class="lines">@@ -74,6 +74,10 @@

</span><span class="cx">                 wp_redirect( add_query_arg( array('updated' =&gt; 'true'), admin_url( 'profile.php' ) ) );

</span><span class="cx">                 die();

</span><span class="cx">         }

</span><ins>+} elseif ( is_multisite() &amp;&amp; IS_PROFILE_PAGE &amp;&amp; !empty( $_GET['dismiss'] ) &amp;&amp; $current_user-&gt;ID . '_new_email' == $_GET['dismiss'] ) {

+        delete_option( $current_user-&gt;ID . '_new_email' );

+        wp_redirect( add_query_arg( array('updated' =&gt; 'true'), admin_url( 'profile.php' ) ) );

+        die();

</ins><span class="cx"> }

</span><span class="cx"> 

</span><span class="cx"> switch ($action) {

</span><span class="lines">@@ -285,7 +289,15 @@

</span><span class="cx"> &lt;table class=&quot;form-table&quot;&gt;

</span><span class="cx"> &lt;tr&gt;

</span><span class="cx">         &lt;th&gt;&lt;label for=&quot;email&quot;&gt;&lt;?php _e('E-mail'); ?&gt; &lt;span class=&quot;description&quot;&gt;&lt;?php _e('(required)'); ?&gt;&lt;/span&gt;&lt;/label&gt;&lt;/th&gt;

</span><del>-        &lt;td&gt;&lt;input type=&quot;text&quot; name=&quot;email&quot; id=&quot;email&quot; value=&quot;&lt;?php echo esc_attr($profileuser-&gt;user_email) ?&gt;&quot; class=&quot;regular-text&quot; /&gt;&lt;/td&gt;

</del><ins>+        &lt;td&gt;&lt;input type=&quot;text&quot; name=&quot;email&quot; id=&quot;email&quot; value=&quot;&lt;?php echo esc_attr($profileuser-&gt;user_email) ?&gt;&quot; class=&quot;regular-text&quot; /&gt;

+        &lt;?php

+        $new_email = get_option( $current_user-&gt;ID . '_new_email' );

+        if ( $new_email &amp;&amp; $new_email != $current_user-&gt;user_email ) : ?&gt;

+        &lt;div class=&quot;updated inline&quot;&gt;

+        &lt;p&gt;&lt;?php printf( __('There is a pending change of your e-mail to &lt;code&gt;%1$s&lt;/code&gt;. &lt;a href=&quot;%2$s&quot;&gt;Cancel&lt;/a&gt;'), $new_email['newemail'], esc_url( admin_url( 'profile.php?dismiss=' . $current_user-&gt;ID . '_new_email' ) ) ); ?&gt;&lt;/p&gt;

+        &lt;/div&gt;

+        &lt;?php endif; ?&gt;

+        &lt;/td&gt;

</ins><span class="cx"> &lt;/tr&gt;

</span><span class="cx"> 

</span><span class="cx"> &lt;tr&gt;

</span></span></pre>

</div>

</div>


</body>

</html>