WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Indicate that the user deletion process affects all content attributed to a given user, not just posts. props seanchayes. fixes #26709. 

Built from https://develop.svn.wordpress.org/trunk@27416


git-svn-id: http://core.svn.wordpress.org/trunk@27263 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Helen Hou-Sandí 2014-03-05 19:20:14 +00:00
parent 09d8606428
commit 84946c75e3
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
wp-admin/network/users.php
View File

@ -22,7 +22,7 @@ function confirm_delete_users( $users ) {
return false; return false;
?> ?>
<h2><?php esc_html_e( 'Users' ); ?></h2> <h2><?php esc_html_e( 'Users' ); ?></h2>
<p><?php _e( 'Transfer or delete posts before deleting users.' ); ?></p> <p><?php _e( 'Transfer or delete content before deleting users.' ); ?></p>
<form action="users.php?action=dodelete" method="post"> <form action="users.php?action=dodelete" method="post">
<input type="hidden" name="dodelete" /> <input type="hidden" name="dodelete" />
<?php <?php
@ -45,7 +45,7 @@ function confirm_delete_users( $users ) {
if ( !empty( $blogs ) ) { if ( !empty( $blogs ) ) {
?> ?>
<br /><fieldset><p><legend><?php printf( __( "What should be done with posts owned by <em>%s</em>?" ), $delete_user->user_login ); ?></legend></p> <br /><fieldset><p><legend><?php printf( __( "What should be done with content owned by <em>%s</em>?" ), $delete_user->user_login ); ?></legend></p>
<?php <?php
foreach ( (array) $blogs as $key => $details ) { foreach ( (array) $blogs as $key => $details ) {
$blog_users = get_users( array( 'blog_id' => $details->userblog_id, 'fields' => array( 'ID', 'user_login' ) ) ); $blog_users = get_users( array( 'blog_id' => $details->userblog_id, 'fields' => array( 'ID', 'user_login' ) ) );
@ -65,9 +65,9 @@ function confirm_delete_users( $users ) {
<ul style="list-style:none;"> <ul style="list-style:none;">
<li><?php printf( __( 'Site: %s' ), $user_site ); ?></li> <li><?php printf( __( 'Site: %s' ), $user_site ); ?></li>
<li><label><input type="radio" id="delete_option0" name="delete[<?php echo $details->userblog_id . '][' . $delete_user->ID ?>]" value="delete" checked="checked" /> <li><label><input type="radio" id="delete_option0" name="delete[<?php echo $details->userblog_id . '][' . $delete_user->ID ?>]" value="delete" checked="checked" />
<?php _e( 'Delete all posts.' ); ?></label></li> <?php _e( 'Delete all content.' ); ?></label></li>
<li><label><input type="radio" id="delete_option1" name="delete[<?php echo $details->userblog_id . '][' . $delete_user->ID ?>]" value="reassign" /> <li><label><input type="radio" id="delete_option1" name="delete[<?php echo $details->userblog_id . '][' . $delete_user->ID ?>]" value="reassign" />
<?php echo __( 'Attribute all posts to:' ) . '</label>' . $user_dropdown; ?></li> <?php echo __( 'Attribute all content to:' ) . '</label>' . $user_dropdown; ?></li>
</ul> </ul>
<?php <?php
} }

10
wp-admin/users.php
View File

@ -43,9 +43,9 @@ $help = '<p>' . __('Hovering over a row in the users list will display action li
'<li>' . __('Edit takes you to the editable profile screen for that user. You can also reach that screen by clicking on the username.') . '</li>'; '<li>' . __('Edit takes you to the editable profile screen for that user. You can also reach that screen by clicking on the username.') . '</li>';
if ( is_multisite() ) if ( is_multisite() )
$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>'; $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>';
else else
$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>'; $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>';
$help .= '</ul>'; $help .= '</ul>';
@ -240,12 +240,12 @@ case 'delete':
?> ?>
</ul> </ul>
<?php if ( $go_delete ) : ?> <?php if ( $go_delete ) : ?>
<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> <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>
<ul style="list-style:none;"> <ul style="list-style:none;">
<li><label><input type="radio" id="delete_option0" name="delete_option" value="delete" /> <li><label><input type="radio" id="delete_option0" name="delete_option" value="delete" />
<?php _e('Delete all posts.'); ?></label></li> <?php _e('Delete all content.'); ?></label></li>
<li><input type="radio" id="delete_option1" name="delete_option" value="reassign" /> <li><input type="radio" id="delete_option1" name="delete_option" value="reassign" />
<?php echo '<label for="delete_option1">' . __( 'Attribute all posts to:' ) . '</label> '; <?php echo '<label for="delete_option1">' . __( 'Attribute all content to:' ) . '</label> ';
wp_dropdown_users( array( 'name' => 'reassign_user', 'exclude' => array_diff( $userids, array($current_user->ID) ) ) ); ?></li> wp_dropdown_users( array( 'name' => 'reassign_user', 'exclude' => array_diff( $userids, array($current_user->ID) ) ) ); ?></li>
</ul></fieldset> </ul></fieldset>
<input type="hidden" name="action" value="dodelete" /> <input type="hidden" name="action" value="dodelete" />