<!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>[20631] trunk/wp-admin: After adding a user, take them back to users.php with an 'Edit user' link in the message.</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://core.trac.wordpress.org/changeset/20631">20631</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2012-04-27 23:13:39 +0000 (Fri, 27 Apr 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>After adding a user, take them back to users.php with an 'Edit user' link in the message.
This removes the (possibly ineffective) search from the redirect, as well as the URL hash that will get covered up by the toolbar.
fixes <a href="http://core.trac.wordpress.org/ticket/19470">#19470</a>. props merty and SergeyBiryukov for initial patches.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminusernewphp">trunk/wp-admin/user-new.php</a></li>
<li><a href="#trunkwpadminusersphp">trunk/wp-admin/users.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminusernewphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/user-new.php (20630 => 20631)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/user-new.php 2012-04-27 22:54:02 UTC (rev 20630)
+++ trunk/wp-admin/user-new.php 2012-04-27 23:13:39 UTC (rev 20631)
</span><span class="lines">@@ -98,12 +98,10 @@
</span><span class="cx"> if ( is_wp_error( $user_id ) ) {
</span><span class="cx"> $add_user_errors = $user_id;
</span><span class="cx"> } else {
</span><del>- if ( current_user_can('edit_users') ) {
- $new_user_login = apply_filters('pre_user_login', sanitize_user(stripslashes($_REQUEST['user_login']), true));
- $redirect = 'users.php?usersearch='. urlencode($new_user_login) . '&update=add' . '#user-' . $user_id;
- } else {
</del><ins>+ if ( current_user_can( 'list_users' ) )
+ $redirect = 'users.php?update=add&id=' . $user_id;
+ else
</ins><span class="cx"> $redirect = add_query_arg( 'update', 'add', 'user-new.php' );
</span><del>- }
</del><span class="cx"> wp_redirect( $redirect );
</span><span class="cx"> die();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpadminusersphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/users.php (20630 => 20631)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/users.php 2012-04-27 22:54:02 UTC (rev 20630)
+++ trunk/wp-admin/users.php 2012-04-27 23:13:39 UTC (rev 20631)
</span><span class="lines">@@ -353,10 +353,16 @@
</span><span class="cx"> case 'del':
</span><span class="cx"> case 'del_many':
</span><span class="cx"> $delete_count = isset($_GET['delete_count']) ? (int) $_GET['delete_count'] : 0;
</span><del>- $messages[] = '<div id="message" class="updated"><p>' . sprintf(_n('%s user deleted', '%s users deleted', $delete_count), $delete_count) . '</p></div>';
</del><ins>+ $messages[] = '<div id="message" class="updated"><p>' . sprintf( _n( 'User deleted.', '%s users deleted.', $delete_count ), number_format_i18n( $delete_count ) ) . '</p></div>';
</ins><span class="cx"> break;
</span><span class="cx"> case 'add':
</span><del>- $messages[] = '<div id="message" class="updated"><p>' . __('New user created.') . '</p></div>';
</del><ins>+ if ( isset( $_GET['id'] ) && ( $user_id = $_GET['id'] ) && current_user_can( 'edit_user', $user_id ) ) {
+ $messages[] = '<div id="message" class="updated"><p>' . sprintf( __( 'New user created. <a href="%s">Edit user</a>' ),
+ esc_url( add_query_arg( 'wp_http_referer', urlencode( stripslashes( $_SERVER['REQUEST_URI'] ) ),
+ self_admin_url( 'user-edit.php?user_id=' . $user_id ) ) ) ) . '</p></div>';
+ } else {
+ $messages[] = '<div id="message" class="updated"><p>' . __( 'New user created.' ) . '</p></div>';
+ }
</ins><span class="cx"> break;
</span><span class="cx"> case 'promote':
</span><span class="cx"> $messages[] = '<div id="message" class="updated"><p>' . __('Changed roles.') . '</p></div>';
</span></span></pre>
</div>
</div>
</body>
</html>