WordPress 4.3

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

diff --git a/wp-admin/network/site-new.php b/wp-admin/network/site-new.php
index b2d28755e2482e09e8e1d1139e54d5c296296129..8dec36cf02c4bb614641a60fd670827afd87813b 100644 (file)
--- a/wp-admin/network/site-new.php
+++ b/wp-admin/network/site-new.php
@@ -76,10 +76,10 @@ if ( isset($_REQUEST['action']) && 'add-site' == $_REQUEST['action'] ) {
        if ( !$user_id ) { // Create a new user with a random password
                $password = wp_generate_password( 12, false );
                $user_id = wpmu_create_user( $domain, $password, $email );
        if ( !$user_id ) { // Create a new user with a random password
                $password = wp_generate_password( 12, false );
                $user_id = wpmu_create_user( $domain, $password, $email );

-               if ( false == $user_id )
+               if ( false === $user_id )

                        wp_die( __( 'There was an error creating the user.' ) );
                else
                        wp_die( __( 'There was an error creating the user.' ) );
                else

-                       wp_new_user_notification( $user_id, $password );
+                       wp_new_user_notification( $user_id, 'both' );

        }
 
        $wpdb->hide_errors();
        }
 
        $wpdb->hide_errors();


@@ -130,7 +130,7 @@ require( ABSPATH . 'wp-admin/admin-header.php' );
 ?>
 
 <div class="wrap">
 ?>
 
 <div class="wrap">

-<h2 id="add-new-site"><?php _e('Add New Site') ?></h2>
+<h1 id="add-new-site"><?php _e( 'Add New Site' ); ?></h1>

 <?php
 if ( ! empty( $messages ) ) {
        foreach ( $messages as $msg )
 <?php
 if ( ! empty( $messages ) ) {
        foreach ( $messages as $msg )


@@ -143,9 +143,9 @@ if ( ! empty( $messages ) ) {
                        <th scope="row"><label for="site-address"><?php _e( 'Site Address' ) ?></label></th>
                        <td>
                        <?php if ( is_subdomain_install() ) { ?>
                        <th scope="row"><label for="site-address"><?php _e( 'Site Address' ) ?></label></th>
                        <td>
                        <?php if ( is_subdomain_install() ) { ?>

-                               <input name="blog[domain]" type="text" class="regular-text" id="site-address" aria-describedby="site-address-desc" /><span class="no-break">.<?php echo preg_replace( '|^www\.|', '', $current_site->domain ); ?></span>
+                               <input name="blog[domain]" type="text" class="regular-text" id="site-address" aria-describedby="site-address-desc" autocapitalize="none" autocorrect="off"/><span class="no-break">.<?php echo preg_replace( '|^www\.|', '', $current_site->domain ); ?></span>

                        <?php } else {
                        <?php } else {

-                               echo $current_site->domain . $current_site->path ?><input name="blog[domain]" type="text" class="regular-text" id="site-address" aria-describedby="site-address-desc" />
+                               echo $current_site->domain . $current_site->path ?><input name="blog[domain]" type="text" class="regular-text" id="site-address" aria-describedby="site-address-desc"  autocapitalize="none" autocorrect="off" />

                        <?php }
                        echo '<p id="site-address-desc">' . __( 'Only lowercase letters (a-z) and numbers are allowed.' ) . '</p>';
                        ?>
                        <?php }
                        echo '<p id="site-address-desc">' . __( 'Only lowercase letters (a-z) and numbers are allowed.' ) . '</p>';
                        ?>


@@ -156,7 +156,7 @@ if ( ! empty( $messages ) ) {
                        <td><input name="blog[title]" type="text" class="regular-text" id="site-title" /></td>
                </tr>
                <tr class="form-field form-required">
                        <td><input name="blog[title]" type="text" class="regular-text" id="site-title" /></td>
                </tr>
                <tr class="form-field form-required">

-                       <th scope="row"><label for="admin-email"><?php _e( 'Admin Email' ) ?></label></td>
+                       <th scope="row"><label for="admin-email"><?php _e( 'Admin Email' ) ?></label></th>

                        <td><input name="blog[email]" type="email" class="regular-text wp-suggest-user" id="admin-email" data-autocomplete-type="search" data-autocomplete-field="user_email" /></td>
                </tr>
                <tr class="form-field">
                        <td><input name="blog[email]" type="email" class="regular-text wp-suggest-user" id="admin-email" data-autocomplete-type="search" data-autocomplete-field="user_email" /></td>
                </tr>
                <tr class="form-field">