Ticket #20221: user-new.diff

user-new.php

@@ -42 +42 @@
         if ( false !== strpos($_REQUEST[ 'email' ], '@') ) {
                 $user_details = get_user_by('email', $_REQUEST[ 'email' ]);
         } else {
-                if ( is_super_admin() ) {
+                if ( current_user_can( 'manage_options' ) ) {
                         $user_details = get_user_by('login', $_REQUEST[ 'email' ]);
                 } else {
                         wp_redirect( add_query_arg( array('update' => 'enter_email'), 'user-new.php' ) );
@@ -66 +66 @@
         if ( ( $username != null && !is_super_admin( $user_id ) ) && ( array_key_exists($blog_id, get_blogs_of_user($user_id)) ) ) {
                 $redirect = add_query_arg( array('update' => 'addexisting'), 'user-new.php' );
         } else {
-                if ( isset( $_POST[ 'noconfirmation' ] ) && is_super_admin() ) {
+                if ( isset( $_POST[ 'noconfirmation' ] ) && current_user_can( 'manage_options' ) ) {
                         add_existing_user_to_blog( array( 'user_id' => $user_id, 'role' => $_REQUEST[ 'role' ] ) );
                         $redirect = add_query_arg( array('update' => 'addnoconfirmation'), 'user-new.php' );
                 } else {
@@ -115 +115 @@
                         $add_user_errors = $user_details[ 'errors' ];
                 } else {
                         $new_user_login = apply_filters('pre_user_login', sanitize_user(stripslashes($_REQUEST['user_login']), true));
-                        if ( isset( $_POST[ 'noconfirmation' ] ) && is_super_admin() ) {
+                        if ( isset( $_POST[ 'noconfirmation' ] ) && current_user_can( 'manage_options' ) ) {
                                 add_filter( 'wpmu_signup_user_notification', '__return_false' ); // Disable confirmation email
                         }
                         wpmu_signup_user( $new_user_login, $_REQUEST[ 'email' ], array( 'add_to_blog' => $wpdb->blogid, 'new_role' => $_REQUEST[ 'role' ] ) );
-                        if ( isset( $_POST[ 'noconfirmation' ] ) && is_super_admin() ) {
+                        if ( isset( $_POST[ 'noconfirmation' ] ) && current_user_can( 'manage_options' ) ) {
                                 $key = $wpdb->get_var( $wpdb->prepare( "SELECT activation_key FROM {$wpdb->signups} WHERE user_login = %s AND user_email = %s", $new_user_login, $_REQUEST[ 'email' ] ) );
                                 wpmu_activate_signup( $key );
                                 $redirect = add_query_arg( array('update' => 'addnoconfirmation'), 'user-new.php' );
@@ -281 +281 @@
                         </select>
                 </td>
         </tr>
-<?php if ( is_super_admin() ) { ?>
+<?php if ( current_user_can( 'manage_options' ) ) { ?>
         <tr>
                 <th scope="row"><label for="adduser-noconfirmation"><?php _e('Skip Confirmation Email') ?></label></th>
                 <td><label for="adduser-noconfirmation"><input type="checkbox" name="noconfirmation" id="adduser-noconfirmation" value="1" /> <?php _e( 'Add the user without sending them a confirmation email.' ); ?></label></td>
@@ -365 +365 @@
                         </select>
                 </td>
         </tr>
-        <?php if ( is_multisite() && is_super_admin() ) { ?>
+        <?php if ( is_multisite() && current_user_can( 'manage_options' ) ) { ?>
         <tr>
                 <th scope="row"><label for="noconfirmation"><?php _e('Skip Confirmation Email') ?></label></th>
                 <td><label for="noconfirmation"><input type="checkbox" name="noconfirmation" id="noconfirmation" value="1" <?php checked( $new_user_ignore_pass ); ?> /> <?php _e( 'Add the user without sending them a confirmation email.' ); ?></label></td>