Ticket #14756: 14756.diff

File 14756.diff, 2.5 KB (added by PeteMall, 2 years ago)

s/Creationism/Evolution/

Line 
1Index: wp-admin/network/site-users.php
2===================================================================
3--- wp-admin/network/site-users.php     (revision 16921)
4+++ wp-admin/network/site-users.php     (working copy)
5@@ -217,9 +217,19 @@
6 
7 <?php do_action( 'network_site_users_after_list_table', '' );?>
8 
9-<?php if ( current_user_can( 'promote_users' ) && apply_filters( 'show_network_site_users_add_existing_form', true ) ) : ?>
10-<h3 id="add-existing-user"><?php _e('Add Existing User') ?></h3>
11-<p><?php _e( 'Enter the username of an existing user on this network.' ) ?></p>
12+<?php if (
13+       ( current_user_can( 'promote_users' ) && apply_filters( 'show_network_site_users_add_existing_form', true ) ) ||
14+       ( current_user_can( 'create_users' ) && apply_filters( 'show_network_site_users_add_new_form', true ) ) ): ?>
15+<h3 id="add-user"><?php _e('Add User to This Site') ?></h3>
16+<?php endif; ?>
17+
18+<?php if ( current_user_can( 'promote_users' ) && apply_filters( 'show_network_site_users_add_existing_form', true ) ) :
19+       if ( apply_filters( 'show_network_site_users_add_new_form', true ) ) : ?>       
20+<p><?php _e( 'You may add from existing network users, or set up a new user to add to this site.' ); ?></p>
21+       <?php else : ?>
22+<p><?php _e( 'You may add from existing network users to this site.' ); ?></p>
23+       <?php endif; ?>
24+<h4 id="add-existing-user"><?php _e('Add Existing User') ?></h3>
25 <form action="site-users.php?action=adduser" id="adduser" method="post">
26        <?php wp_nonce_field( 'edit-site' ); ?>
27        <input type="hidden" name="id" value="<?php echo esc_attr( $id ) ?>" />
28@@ -247,9 +257,8 @@
29 </form>
30 <?php endif; ?>
31 
32-<?php if (  current_user_can( 'create_users' ) && apply_filters( 'show_network_site_users_add_new_form', true ) ) : ?>
33-<h3 id="add-new-user"><?php _e('Create New User') ?></h3>
34-<p><?php _e( 'Create a brand new user and add it to this site.' ) ?></p>
35+<?php if ( current_user_can( 'create_users' ) && apply_filters( 'show_network_site_users_add_new_form', true ) ) : ?>
36+<h4 id="add-new-user"><?php _e('Add New User') ?></h3>
37 <form action="<?php echo network_admin_url('site-users.php?action=newuser'); ?>" id="newuser" method="post">
38        <?php wp_nonce_field( 'edit-site' ); ?>
39        <input type="hidden" name="id" value="<?php echo esc_attr( $id ) ?>" />
40@@ -280,7 +289,7 @@
41                </tr>
42        </table>
43        <?php wp_nonce_field( 'add-user', '_wpnonce_add-user' ) ?>
44-       <?php submit_button( __('Add User'), 'primary', 'add-user' ); ?>
45+       <?php submit_button( __('Add New User'), 'primary', 'add-user' ); ?>
46 </form>
47 </div>
48 <?php endif; ?>