WordPress 4.3

[autoinstalls/wordpress.git] / wp-admin / network / user-new.php

diff --git a/wp-admin/network/user-new.php b/wp-admin/network/user-new.php
index b47e74cc12583043b0add73f75a3cabbf1f26b89..002e098dc17a614f1c1db62eae22118de12df834 100644 (file)
--- a/wp-admin/network/user-new.php
+++ b/wp-admin/network/user-new.php
@@ -51,7 +51,7 @@ if ( isset($_REQUEST['action']) && 'add-user' == $_REQUEST['action'] ) {
                if ( ! $user_id ) {
                        $add_user_errors = new WP_Error( 'add_user_fail', __( 'Cannot add user.' ) );
                } else {
-                       wp_new_user_notification( $user_id, $password );
+                       wp_new_user_notification( $user_id, 'both' );
                        wp_redirect( add_query_arg( array('update' => 'added'), 'user-new.php' ) );
                        exit;
                }
@@ -70,7 +70,7 @@ $parent_file = 'users.php';
 require( ABSPATH . 'wp-admin/admin-header.php' ); ?>
 
 <div class="wrap">
-<h2 id="add-new-user"><?php _e('Add New User') ?></h2>
+<h1 id="add-new-user"><?php _e( 'Add New User' ); ?></h1>
 <?php
 if ( ! empty( $messages ) ) {
        foreach ( $messages as $msg )
@@ -85,18 +85,18 @@ if ( isset( $add_user_errors ) && is_wp_error( $add_user_errors ) ) { ?>
                ?>
        </div>
 <?php } ?>
-       <form action="<?php echo network_admin_url('user-new.php?action=add-user'); ?>" id="adduser" method="post">
+       <form action="<?php echo network_admin_url('user-new.php?action=add-user'); ?>" id="adduser" method="post" novalidate="novalidate">
        <table class="form-table">
                <tr class="form-field form-required">
                        <th scope="row"><label for="username"><?php _e( 'Username' ) ?></label></th>
-                       <td><input type="text" class="regular-text" name="user[username]" id="username" /></td>
+                       <td><input type="text" class="regular-text" name="user[username]" id="username" autocapitalize="none" autocorrect="off" /></td>
                </tr>
                <tr class="form-field form-required">
                        <th scope="row"><label for="email"><?php _e( 'Email' ) ?></label></th>
-                       <td><input type="text" class="regular-text" name="user[email]" id="email"/></td>
+                       <td><input type="email" class="regular-text" name="user[email]" id="email"/></td>
                </tr>
                <tr class="form-field">
-                       <td colspan="2"><?php _e( 'Username and password will be mailed to the above email address.' ) ?></td>
+                       <td colspan="2"><?php _e( 'A password reset link will be sent to the user via email.' ) ?></td>
                </tr>
        </table>
        <?php wp_nonce_field( 'add-user', '_wpnonce_add-user' ); ?>