WordPress.org

Make WordPress Core

Ticket #30486: ticket-30486.diff

File ticket-30486.diff, 9.9 KB (added by cfoellmann, 6 years ago)

unfinished-patch

  • wp-admin/includes/ms.php

    diff --git wp-admin/includes/ms.php wp-admin/includes/ms.php
    index 4735cf9..383cd3f 100644
    function upload_space_setting( $id ) { 
    433433
    434434        ?>
    435435        <tr>
    436                 <th><?php _e( 'Site Upload Space Quota '); ?></th>
    437                 <td><input type="number" step="1" min="0" style="width: 100px" name="option[blog_upload_space]" value="<?php echo $quota; ?>" /> <?php _e( 'MB (Leave blank for network default)' ); ?></td>
     436                <th><label for="blog_upload_space"><?php _e( 'Site Upload Space Quota '); ?></th>
     437                <td><input type="number" step="1" min="0" style="width: 100px" name="option[blog_upload_space]" id="blog_upload_space" value="<?php echo $quota; ?>" /> <?php _e( 'MB (Leave blank for network default)' ); ?></td>
    438438        </tr>
    439439        <?php
    440440}
  • wp-admin/network/site-info.php

    diff --git wp-admin/network/site-info.php wp-admin/network/site-info.php
    index 2fb9fef..bb2872e 100644
    if ( ! empty( $messages ) ) { 
    122122        <input type="hidden" name="id" value="<?php echo esc_attr( $id ) ?>" />
    123123        <table class="form-table">
    124124                <tr class="form-field form-required">
    125                         <th scope="row"><?php _e( 'Domain' ) ?></th>
     125                        <th scope="row"><label for="domain"><?php _e( 'Domain' ) ?></label></th>
    126126                        <?php if ( $is_main_site ) { ?>
    127127                                <td><code><?php echo $parsed['scheme'] . '://' . esc_attr( $details->domain ) ?></code></td>
    128128                        <?php } else { ?>
    if ( ! empty( $messages ) ) { 
    130130                        <?php } ?>
    131131                </tr>
    132132                <tr class="form-field form-required">
    133                         <th scope="row"><?php _e( 'Path' ) ?></th>
     133                        <th scope="row"><label for="path"><?php _e( 'Path' ) ?></label></th>
    134134                        <?php if ( $is_main_site ) { ?>
    135135                        <td><code><?php echo esc_attr( $details->path ) ?></code></td>
    136136                        <?php
    if ( ! empty( $messages ) ) { 
    138138                                switch_to_blog( $id );
    139139                        ?>
    140140                        <td><input name="blog[path]" type="text" id="path" value="<?php echo esc_attr( $details->path ) ?>" size="40" style="margin-bottom:5px;" />
    141                         <br /><input type="checkbox" style="width:20px;" name="update_home_url" value="update" <?php if ( get_option( 'siteurl' ) == untrailingslashit( get_blogaddress_by_id ($id ) ) || get_option( 'home' ) == untrailingslashit( get_blogaddress_by_id( $id ) ) ) echo 'checked="checked"'; ?> /> <?php _e( 'Update <code>siteurl</code> and <code>home</code> as well.' ); ?></td>
     141                                <br /><input type="checkbox" style="width:20px;" name="update_home_url" id="update_home_url" value="update" <?php if ( get_option( 'siteurl' ) == untrailingslashit( get_blogaddress_by_id ($id ) ) || get_option( 'home' ) == untrailingslashit( get_blogaddress_by_id( $id ) ) ) echo 'checked="checked"'; ?> /> <label for="update_home_url"><?php _e( 'Update <code>siteurl</code> and <code>home</code> as well.' ); ?></label></td>
    142142                        <?php
    143143                                restore_current_blog();
    144144                        } ?>
  • wp-admin/network/site-new.php

    diff --git wp-admin/network/site-new.php wp-admin/network/site-new.php
    index 1a0e6c4..57277af 100644
    if ( ! empty( $messages ) ) { 
    127127<?php wp_nonce_field( 'add-blog', '_wpnonce_add-blog' ) ?>
    128128        <table class="form-table">
    129129                <tr class="form-field form-required">
    130                         <th scope="row"><?php _e( 'Site Address' ) ?></th>
     130                        <th scope="row"><label for="domain"><?php _e( 'Site Address' ) ?></label></th>
    131131                        <td>
    132132                        <?php if ( is_subdomain_install() ) { ?>
    133                                 <input name="blog[domain]" type="text" class="regular-text" title="<?php esc_attr_e( 'Domain' ) ?>"/><span class="no-break">.<?php echo preg_replace( '|^www\.|', '', $current_site->domain ); ?></span>
     133                                <input name="blog[domain]" type="text" id="domain" class="regular-text" title="<?php esc_attr_e( 'Domain' ) ?>"/><span class="no-break">.<?php echo preg_replace( '|^www\.|', '', $current_site->domain ); ?></span>
    134134                        <?php } else {
    135                                 echo $current_site->domain . $current_site->path ?><input name="blog[domain]" class="regular-text" type="text" title="<?php esc_attr_e( 'Domain' ) ?>"/>
     135                                echo $current_site->domain . $current_site->path ?><input name="blog[domain]" class="regular-text" type="text" id="domain" title="<?php esc_attr_e( 'Domain' ) ?>"/>
    136136                        <?php }
    137137                        echo '<p>' . __( 'Only lowercase letters (a-z) and numbers are allowed.' ) . '</p>';
    138138                        ?>
    139139                        </td>
    140140                </tr>
    141141                <tr class="form-field form-required">
    142                         <th scope="row"><?php _e( 'Site Title' ) ?></th>
    143                         <td><input name="blog[title]" type="text" class="regular-text" title="<?php esc_attr_e( 'Title' ) ?>"/></td>
     142                        <th scope="row"><label for="title"><?php _e( 'Site Title' ) ?></label></th>
     143                        <td><input name="blog[title]" type="text" id="title" class="regular-text" title="<?php esc_attr_e( 'Title' ) ?>"/></td>
    144144                </tr>
    145145                <tr class="form-field form-required">
    146                         <th scope="row"><?php _e( 'Admin Email' ) ?></th>
    147                         <td><input name="blog[email]" type="email" class="regular-text wp-suggest-user" data-autocomplete-type="search" data-autocomplete-field="user_email" title="<?php esc_attr_e( 'Email' ) ?>"/></td>
     146                        <th scope="row"><label for="email"><?php _e( 'Admin Email' ) ?></label></th>
     147                        <td><input name="blog[email]" type="email" id="email" class="regular-text wp-suggest-user" data-autocomplete-type="search" data-autocomplete-field="user_email" title="<?php esc_attr_e( 'Email' ) ?>"/></td>
    148148                </tr>
    149149                <tr class="form-field">
    150150                        <td colspan="2"><?php _e( 'A new user will be created if the above email address is not in the database.' ) ?><br /><?php _e( 'The username and password will be mailed to this email address.' ) ?></td>
  • wp-admin/network/site-settings.php

    diff --git wp-admin/network/site-settings.php wp-admin/network/site-settings.php
    index 1decdcb..d232ea6 100644
    if ( ! empty( $messages ) ) { 
    138138                        if ( strpos( $option->option_value, "\n" ) !== false ) {
    139139                        ?>
    140140                                <tr class="form-field">
    141                                         <th scope="row"><?php echo ucwords( str_replace( "_", " ", $option->option_name ) ) ?></th>
     141                                        <th scope="row"><label for="<?php echo esc_attr( $option->option_name ) ?>"><?php echo ucwords( str_replace( "_", " ", $option->option_name ) ) ?></label></th>
    142142                                        <td><textarea class="<?php echo $class; ?>" rows="5" cols="40" name="option[<?php echo esc_attr( $option->option_name ) ?>]" id="<?php echo esc_attr( $option->option_name ) ?>"<?php disabled( $disabled ) ?>><?php echo esc_textarea( $option->option_value ) ?></textarea></td>
    143143                                </tr>
    144144                        <?php
    145145                        } else {
    146146                        ?>
    147147                                <tr class="form-field">
    148                                         <th scope="row"><?php echo esc_html( ucwords( str_replace( "_", " ", $option->option_name ) ) ); ?></th>
     148                                        <th scope="row"><label for="<?php echo esc_attr( $option->option_name ) ?>"><?php echo esc_html( ucwords( str_replace( "_", " ", $option->option_name ) ) ); ?></label></th>
    149149                                        <?php if ( $is_main_site && in_array( $option->option_name, array( 'siteurl', 'home' ) ) ) { ?>
    150150                                        <td><code><?php echo esc_html( $option->option_value ) ?></code></td>
    151151                                        <?php } else { ?>
  • wp-admin/network/site-users.php

    diff --git wp-admin/network/site-users.php wp-admin/network/site-users.php
    index b5a6ab7..4075f30 100644
    if ( current_user_can( 'promote_users' ) && apply_filters( 'show_network_site_us 
    264264        <input type="hidden" name="id" value="<?php echo esc_attr( $id ) ?>" />
    265265        <table class="form-table">
    266266                <tr>
    267                         <th scope="row"><?php _e( 'Username' ); ?></th>
     267                        <th scope="row"><label for="newuser"><?php _e( 'Username' ); ?></label></th>
    268268                        <td><input type="text" class="regular-text wp-suggest-user" name="newuser" id="newuser" /></td>
    269269                </tr>
    270270                <tr>
    if ( current_user_can( 'create_users' ) && apply_filters( 'show_network_site_use 
    293293        <input type="hidden" name="id" value="<?php echo esc_attr( $id ) ?>" />
    294294        <table class="form-table">
    295295                <tr>
    296                         <th scope="row"><?php _e( 'Username' ) ?></th>
    297                         <td><input type="text" class="regular-text" name="user[username]" /></td>
     296                        <th scope="row"><label for="user_username"><?php _e( 'Username' ) ?></label></th>
     297                        <td><input type="text" class="regular-text" name="user[username]" id="user_username" /></td>
    298298                </tr>
    299299                <tr>
    300                         <th scope="row"><?php _e( 'Email' ) ?></th>
    301                         <td><input type="text" class="regular-text" name="user[email]" /></td>
     300                        <th scope="row"><label for="user_email"><?php _e( 'Email' ) ?></label></th>
     301                        <td><input type="text" class="regular-text" name="user[email]" id="user_email" /></td>
    302302                </tr>
    303303                <tr>
    304304                        <th scope="row"><?php _e( 'Role' ); ?></th>
  • wp-admin/network/user-new.php

    diff --git wp-admin/network/user-new.php wp-admin/network/user-new.php
    index 5c67140..225a206 100644
    if ( isset( $add_user_errors ) && is_wp_error( $add_user_errors ) ) { ?> 
    8787        <form action="<?php echo network_admin_url('user-new.php?action=add-user'); ?>" id="adduser" method="post">
    8888        <table class="form-table">
    8989                <tr class="form-field form-required">
    90                         <th scope="row"><?php _e( 'Username' ) ?></th>
    91                         <td><input type="text" class="regular-text" name="user[username]" /></td>
     90                        <th scope="row"><label for="username"><?php _e( 'Username' ) ?></label></th>
     91                        <td><input type="text" class="regular-text" name="user[username]" id="username" /></td>
    9292                </tr>
    9393                <tr class="form-field form-required">
    94                         <th scope="row"><?php _e( 'Email' ) ?></th>
    95                         <td><input type="text" class="regular-text" name="user[email]" /></td>
     94                        <th scope="row"><label for="email"><?php _e( 'Email' ) ?></label></th>
     95                        <td><input type="text" class="regular-text" name="user[email]" id="email"/></td>
    9696                </tr>
    9797                <tr class="form-field">
    9898                        <td colspan="2"><?php _e( 'Username and password will be mailed to the above email address.' ) ?></td>
  • wp-includes/version.php

    diff --git wp-includes/version.php wp-includes/version.php
    index 963729f..b684c41 100644
     
    44 *
    55 * @global string $wp_version
    66 */
    7 $wp_version = '4.1-beta2-30549';
     7$wp_version = '4.1-beta2-30548';
    88
    99/**
    1010 * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.