<!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>[14608] trunk/wp-admin/includes/user.php:
Fix the default password nag clearer to work when an admin sets someone elses password away from the default
.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/14608">14608</a></dd>
<dt>Author</dt> <dd>westi</dd>
<dt>Date</dt> <dd>2010-05-13 21:08:01 +0000 (Thu, 13 May 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix the default password nag clearer to work when an admin sets someone elses password away from the default. Fixes <a href="http://trac.wordpress.org/ticket/12334">#12334</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesuserphp">trunk/wp-admin/includes/user.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesuserphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/user.php (14607 => 14608)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/user.php 2010-05-13 20:39:54 UTC (rev 14607)
+++ trunk/wp-admin/includes/user.php 2010-05-13 21:08:01 UTC (rev 14608)
</span><span class="lines">@@ -834,14 +834,13 @@
</span><span class="cx">
</span><span class="cx"> add_action('profile_update', 'default_password_nag_edit_user', 10, 2);
</span><span class="cx"> function default_password_nag_edit_user($user_ID, $old_data) {
</span><del>- global $user_ID;
- if ( ! get_user_option('default_password_nag') ) //Short circuit it.
</del><ins>+ if ( ! get_user_option('default_password_nag', $user_ID) ) //Short circuit it.
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> $new_data = get_userdata($user_ID);
</span><span class="cx">
</span><span class="cx"> if ( $new_data->user_pass != $old_data->user_pass ) { //Remove the nag if the password has been changed.
</span><del>- delete_user_setting('default_password_nag');
</del><ins>+ delete_user_setting('default_password_nag', $user_ID);
</ins><span class="cx"> update_user_option($user_ID, 'default_password_nag', false, true);
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>