WordPress.org

Make WordPress Core

Changeset 27416


Ignore:
Timestamp:
03/05/2014 07:19:52 PM (7 years ago)
Author:
helen
Message:

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

Location:
trunk/src/wp-admin
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/wp-admin/network/users.php

    r26518 r27416  
    2323    ?>
    2424    <h2><?php esc_html_e( 'Users' ); ?></h2>
    25     <p><?php _e( 'Transfer or delete posts before deleting users.' ); ?></p>
     25    <p><?php _e( 'Transfer or delete content before deleting users.' ); ?></p>
    2626    <form action="users.php?action=dodelete" method="post">
    2727    <input type="hidden" name="dodelete" />
     
    4646            if ( !empty( $blogs ) ) {
    4747                ?>
    48                 <br /><fieldset><p><legend><?php printf( __( "What should be done with posts owned by <em>%s</em>?" ), $delete_user->user_login ); ?></legend></p>
     48                <br /><fieldset><p><legend><?php printf( __( "What should be done with content owned by <em>%s</em>?" ), $delete_user->user_login ); ?></legend></p>
    4949                <?php
    5050                foreach ( (array) $blogs as $key => $details ) {
     
    6666                            <li><?php printf( __( 'Site: %s' ), $user_site ); ?></li>
    6767                            <li><label><input type="radio" id="delete_option0" name="delete[<?php echo $details->userblog_id . '][' . $delete_user->ID ?>]" value="delete" checked="checked" />
    68                             <?php _e( 'Delete all posts.' ); ?></label></li>
     68                            <?php _e( 'Delete all content.' ); ?></label></li>
    6969                            <li><label><input type="radio" id="delete_option1" name="delete[<?php echo $details->userblog_id . '][' . $delete_user->ID ?>]" value="reassign" />
    70                             <?php echo __( 'Attribute all posts to:' ) . '</label>' . $user_dropdown; ?></li>
     70                            <?php echo __( 'Attribute all content to:' ) . '</label>' . $user_dropdown; ?></li>
    7171                        </ul>
    7272                        <?php
  • trunk/src/wp-admin/users.php

    r27369 r27416  
    4444
    4545if ( is_multisite() )
    46     $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>';
     46    $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>';
    4747else
    48     $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>';
     48    $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>';
    4949
    5050$help .= '</ul>';
     
    241241    </ul>
    242242<?php if ( $go_delete ) : ?>
    243     <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>
     243    <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>
    244244    <ul style="list-style:none;">
    245245        <li><label><input type="radio" id="delete_option0" name="delete_option" value="delete" />
    246         <?php _e('Delete all posts.'); ?></label></li>
     246        <?php _e('Delete all content.'); ?></label></li>
    247247        <li><input type="radio" id="delete_option1" name="delete_option" value="reassign" />
    248         <?php echo '<label for="delete_option1">' . __( 'Attribute all posts to:' ) . '</label> ';
     248        <?php echo '<label for="delete_option1">' . __( 'Attribute all content to:' ) . '</label> ';
    249249        wp_dropdown_users( array( 'name' => 'reassign_user', 'exclude' => array_diff( $userids, array($current_user->ID) ) ) ); ?></li>
    250250    </ul></fieldset>
Note: See TracChangeset for help on using the changeset viewer.