<!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>[27416] trunk/src/wp-admin: Indicate that the user deletion process affects all content attributed to a given user, not just posts.</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 { 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">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/27416">27416</a></dd>
<dt>Author</dt> <dd>helen</dd>
<dt>Date</dt> <dd>2014-03-05 19:19:52 +0000 (Wed, 05 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Indicate that the user deletion process affects all content attributed to a given user, not just posts. props seanchayes. fixes <a href="http://core.trac.wordpress.org/ticket/26709">#26709</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminnetworkusersphp">trunk/src/wp-admin/network/users.php</a></li>
<li><a href="#trunksrcwpadminusersphp">trunk/src/wp-admin/users.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminnetworkusersphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/network/users.php (27415 => 27416)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/network/users.php 2014-03-05 18:36:30 UTC (rev 27415)
+++ trunk/src/wp-admin/network/users.php 2014-03-05 19:19:52 UTC (rev 27416)
</span><span class="lines">@@ -22,7 +22,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> ?>
</span><span class="cx"> <h2><?php esc_html_e( 'Users' ); ?></h2>
</span><del>- <p><?php _e( 'Transfer or delete posts before deleting users.' ); ?></p>
</del><ins>+ <p><?php _e( 'Transfer or delete content before deleting users.' ); ?></p>
</ins><span class="cx"> <form action="users.php?action=dodelete" method="post">
</span><span class="cx"> <input type="hidden" name="dodelete" />
</span><span class="cx"> <?php
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx">
</span><span class="cx"> if ( !empty( $blogs ) ) {
</span><span class="cx"> ?>
</span><del>- <br /><fieldset><p><legend><?php printf( __( "What should be done with posts owned by <em>%s</em>?" ), $delete_user->user_login ); ?></legend></p>
</del><ins>+ <br /><fieldset><p><legend><?php printf( __( "What should be done with content owned by <em>%s</em>?" ), $delete_user->user_login ); ?></legend></p>
</ins><span class="cx"> <?php
</span><span class="cx"> foreach ( (array) $blogs as $key => $details ) {
</span><span class="cx"> $blog_users = get_users( array( 'blog_id' => $details->userblog_id, 'fields' => array( 'ID', 'user_login' ) ) );
</span><span class="lines">@@ -65,9 +65,9 @@
</span><span class="cx"> <ul style="list-style:none;">
</span><span class="cx"> <li><?php printf( __( 'Site: %s' ), $user_site ); ?></li>
</span><span class="cx"> <li><label><input type="radio" id="delete_option0" name="delete[<?php echo $details->userblog_id . '][' . $delete_user->ID ?>]" value="delete" checked="checked" />
</span><del>- <?php _e( 'Delete all posts.' ); ?></label></li>
</del><ins>+ <?php _e( 'Delete all content.' ); ?></label></li>
</ins><span class="cx"> <li><label><input type="radio" id="delete_option1" name="delete[<?php echo $details->userblog_id . '][' . $delete_user->ID ?>]" value="reassign" />
</span><del>- <?php echo __( 'Attribute all posts to:' ) . '</label>' . $user_dropdown; ?></li>
</del><ins>+ <?php echo __( 'Attribute all content to:' ) . '</label>' . $user_dropdown; ?></li>
</ins><span class="cx"> </ul>
</span><span class="cx"> <?php
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunksrcwpadminusersphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/users.php (27415 => 27416)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/users.php 2014-03-05 18:36:30 UTC (rev 27415)
+++ trunk/src/wp-admin/users.php 2014-03-05 19:19:52 UTC (rev 27416)
</span><span class="lines">@@ -43,9 +43,9 @@
</span><span class="cx"> '<li>' . __('Edit takes you to the editable profile screen for that user. You can also reach that screen by clicking on the username.') . '</li>';
</span><span class="cx">
</span><span class="cx"> if ( is_multisite() )
</span><del>- $help .= '<li>' . __( 'Remove allows you to remove a user from your site. It does not delete their posts. You can also remove multiple users at once by using Bulk Actions.' ) . '</li>';
</del><ins>+ $help .= '<li>' . __( 'Remove allows you to remove a user from your site. It does not delete their content. You can also remove multiple users at once by using Bulk Actions.' ) . '</li>';
</ins><span class="cx"> else
</span><del>- $help .= '<li>' . __( 'Delete brings you to the Delete Users screen for confirmation, where you can permanently remove a user from your site and delete their posts. You can also delete multiple users at once by using Bulk Actions.' ) . '</li>';
</del><ins>+ $help .= '<li>' . __( 'Delete brings you to the Delete Users screen for confirmation, where you can permanently remove a user from your site and delete their content. You can also delete multiple users at once by using Bulk Actions.' ) . '</li>';
</ins><span class="cx">
</span><span class="cx"> $help .= '</ul>';
</span><span class="cx">
</span><span class="lines">@@ -240,12 +240,12 @@
</span><span class="cx"> ?>
</span><span class="cx"> </ul>
</span><span class="cx"> <?php if ( $go_delete ) : ?>
</span><del>- <fieldset><p><legend><?php echo _n( 'What should be done with posts owned by this user?', 'What should be done with posts owned by these users?', $go_delete ); ?></legend></p>
</del><ins>+ <fieldset><p><legend><?php echo _n( 'What should be done with content owned by this user?', 'What should be done with content owned by these users?', $go_delete ); ?></legend></p>
</ins><span class="cx"> <ul style="list-style:none;">
</span><span class="cx"> <li><label><input type="radio" id="delete_option0" name="delete_option" value="delete" />
</span><del>- <?php _e('Delete all posts.'); ?></label></li>
</del><ins>+ <?php _e('Delete all content.'); ?></label></li>
</ins><span class="cx"> <li><input type="radio" id="delete_option1" name="delete_option" value="reassign" />
</span><del>- <?php echo '<label for="delete_option1">' . __( 'Attribute all posts to:' ) . '</label> ';
</del><ins>+ <?php echo '<label for="delete_option1">' . __( 'Attribute all content to:' ) . '</label> ';
</ins><span class="cx"> wp_dropdown_users( array( 'name' => 'reassign_user', 'exclude' => array_diff( $userids, array($current_user->ID) ) ) ); ?></li>
</span><span class="cx"> </ul></fieldset>
</span><span class="cx"> <input type="hidden" name="action" value="dodelete" />
</span></span></pre>
</div>
</div>
</body>
</html>