WordPress.org
Get WordPress

Make WordPress Core

Ticket #54394: 53494.4.patch

File 53494.4.patch, 9.2 KB (added by sabernhardt, 4 years ago)

using functions in comments template, the New Site form, and 3 media functions

  • src/wp-admin/includes/media.php

     
    17141714                <tr><td colspan='2' class='imgedit-response' id='imgedit-response-$post->ID'></td></tr>\n
    17151715                <tr><td style='display:none' colspan='2' class='image-editor' id='image-editor-$post->ID'></td></tr>\n
    17161716                <tr><td colspan='2'><p class='media-types media-types-required-info'>" .
    1717                         /* translators: %s: Asterisk symbol (*). */
    1718                         sprintf( __( 'Required fields are marked %s' ), '<span class="required">*</span>' ) .
     1717                        wp_required_field_message( '' ) .
    17191718                "</p></td></tr>\n";
    17201719
    17211720        $defaults = array(
    … …  
    17951794                        continue;
    17961795                }
    17971796
    1798                 $required      = $field['required'] ? '<span class="required">*</span>' : '';
     1797                $required      = $field['required'] ? wp_required_field_indicator( '' ) : '';
    17991798                $required_attr = $field['required'] ? ' required' : '';
    18001799                $class         = $id;
    18011800                $class        .= $field['required'] ? ' form-required' : '';
    … …  
    19861985                }
    19871986
    19881987                $readonly      = ! $user_can_edit && ! empty( $field['taxonomy'] ) ? " readonly='readonly' " : '';
    1989                 $required      = $field['required'] ? '<span class="required">*</span>' : '';
     1988                $required      = $field['required'] ? wp_required_field_indicator( '' ) : '';
    19901989                $required_attr = $field['required'] ? ' required' : '';
    19911990                $class         = 'compat-field-' . $id;
    19921991                $class        .= $field['required'] ? ' form-required' : '';
    … …  
    20422041
    20432042        if ( $item ) {
    20442043                $item = '<p class="media-types media-types-required-info">' .
    2045                         /* translators: %s: Asterisk symbol (*). */
    2046                         sprintf( __( 'Required fields are marked %s' ), '<span class="required">*</span>' ) .
     2044                        wp_required_field_message( '' ) .
    20472045                        '</p>' .
    20482046                        '<table class="compat-attachment-fields">' . $item . '</table>';
    20492047        }
    … …  
    29402938        return '
    29412939        <p class="media-types"><label><input type="radio" name="media_type" value="image" id="image-only"' . checked( 'image-only', $view, false ) . ' /> ' . __( 'Image' ) . '</label> &nbsp; &nbsp; <label><input type="radio" name="media_type" value="generic" id="not-image"' . checked( 'not-image', $view, false ) . ' /> ' . __( 'Audio, Video, or Other File' ) . '</label></p>
    29422940        <p class="media-types media-types-required-info">' .
    2943                 /* translators: %s: Asterisk symbol (*). */
    2944                 sprintf( __( 'Required fields are marked %s' ), '<span class="required">*</span>' ) .
     2941                wp_required_field_message( '' ) .
    29452942        '</p>
    29462943        <table class="describe ' . $table_class . '"><tbody>
    29472944                <tr>
    29482945                        <th scope="row" class="label" style="width:130px;">
    2949                                 <label for="src"><span class="alignleft">' . __( 'URL' ) . '</span> <span class="required">*</span></label>
     2946                                <label for="src"><span class="alignleft">' . __( 'URL' ) . '</span>' . wp_required_field_indicator() . '</label>
    29502947                                <span class="alignright" id="status_img"></span>
    29512948                        </th>
    29522949                        <td class="field"><input id="src" name="src" value="" type="text" required onblur="addExtImage.getImageData()" /></td>
    … …  
    29542951
    29552952                <tr>
    29562953                        <th scope="row" class="label">
    2957                                 <label for="title"><span class="alignleft">' . __( 'Title' ) . '</span> <span class="required">*</span></label>
     2954                                <label for="title"><span class="alignleft">' . __( 'Title' ) . '</span>' . wp_required_field_indicator() . '</label>
    29582955                        </th>
    29592956                        <td class="field"><input id="title" name="title" value="" type="text" required /></td>
    29602957                </tr>
    … …  
    29632960
    29642961                <tr class="image-only">
    29652962                        <th scope="row" class="label">
    2966                                 <label for="alt"><span class="alignleft">' . __( 'Alternative Text' ) . '</span></label>
     2963                                <label for="alt"><span class="alignleft">' . __( 'Alternative Text' ) . '</span>' . wp_required_field_indicator() . '</label>
    29672964                        </th>
    29682965                        <td class="field"><input id="alt" name="alt" value="" type="text" required />
    29692966                        <p class="help">' . __( 'Alt text for the image, e.g. &#8220;The Mona Lisa&#8221;' ) . '</p></td>

  • src/wp-admin/network/site-new.php

     
    194194}
    195195?>
    196196<p>
    197 <?php
    198 printf(
    199         /* translators: %s: Asterisk symbol (*). */
    200         __( 'Required fields are marked %s' ),
    201         '<span class="required">*</span>'
    202 );
    203 ?>
     197<?php wp_required_field_message( '', true ); ?>
    204198</p>
    205199<form method="post" action="<?php echo esc_url( network_admin_url( 'site-new.php?action=add-site' ) ); ?>" novalidate="novalidate">
    206200<?php wp_nonce_field( 'add-blog', '_wpnonce_add-blog' ); ?>
    207201        <table class="form-table" role="presentation">
    208202                <tr class="form-field form-required">
    209                         <th scope="row"><label for="site-address"><?php _e( 'Site Address (URL)' ); ?> <span class="required">*</span></label></th>
     203                        <th scope="row"><label for="site-address"><?php _e( 'Site Address (URL)' ); wp_required_field_indicator( ' ', true ); ?></label></th>
    210204                        <td>
    211205                        <?php if ( is_subdomain_install() ) { ?>
    212206                                <input name="blog[domain]" type="text" class="regular-text ltr" id="site-address" aria-describedby="site-address-desc" autocapitalize="none" autocorrect="off" required /><span class="no-break">.<?php echo preg_replace( '|^www\.|', '', get_network()->domain ); ?></span>
    … …  
    222216                        </td>
    223217                </tr>
    224218                <tr class="form-field form-required">
    225                         <th scope="row"><label for="site-title"><?php _e( 'Site Title' ); ?> <span class="required">*</span></label></th>
     219                        <th scope="row"><label for="site-title"><?php _e( 'Site Title' ); wp_required_field_indicator( ' ', true ); ?></label></th>
    226220                        <td><input name="blog[title]" type="text" class="regular-text" id="site-title" required /></td>
    227221                </tr>
    228222                <?php
    … …  
    257251                        </tr>
    258252                <?php endif; // Languages. ?>
    259253                <tr class="form-field form-required">
    260                         <th scope="row"><label for="admin-email"><?php _e( 'Admin Email' ); ?> <span class="required">*</span></label></th>
     254                        <th scope="row"><label for="admin-email"><?php _e( 'Admin Email' ); wp_required_field_indicator( ' ', true ); ?></label></th>
    261255                        <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" aria-describedby="site-admin-email" required /></td>
    262256                </tr>
    263257                <tr class="form-field">

  • src/wp-includes/comment-template.php

     
    23592359        $required_attribute = ( $html5 ? ' required' : ' required="required"' );
    23602360        $checked_attribute  = ( $html5 ? ' checked' : ' checked="checked"' );
    23612361
    2362         // Identify required fields visually.
    2363         $required_indicator = ' <span class="required" aria-hidden="true">*</span>';
     2362        // Identify required fields visually and create a message about the indicator.
     2363        $required_indicator = wp_required_field_indicator();
     2364        $required_text      = wp_required_field_message();
    23642365
    23652366        $fields = array(
    23662367                'author' => sprintf(
    … …  
    24252426                }
    24262427        }
    24272428
    2428         $required_text = sprintf(
    2429                 /* translators: %s: Asterisk symbol (*). */
    2430                 ' <span class="required-field-message" aria-hidden="true">' . __( 'Required fields are marked %s' ) . '</span>',
    2431                 trim( $required_indicator )
    2432         );
    2433 
    24342429        /**
    24352430         * Filters the default comment form fields.
    24362431         *

  • src/wp-includes/functions.php

     
    84428442}
    84438443
    84448444/**
     8445 * Assign a visual indicator for required form fields.
     8446 *
     8447 * @since 6.0.0
     8448 *
     8449 * @param string $space_before Space character, entity or empty string to add before glyph. Default ' '.
     8450 * @param bool   $echo         Whether to output the result or instead return it. Default false.
     8451 * @return string Indicator glyph wrapped in a `span` tag.
     8452 */
     8453function wp_required_field_indicator( $space_before = ' ', $echo = false ) {
     8454        /* translators: Character to identify required form fields. */
     8455        $glyph     = __( '*' );
     8456        $indicator = sprintf(
     8457                '%1$s<span class="required" aria-hidden="true">%2$s</span>',
     8458                esc_html( $space_before ),
     8459                esc_html( $glyph ),
     8460        );
     8461
     8462        if ( ! $echo ) {
     8463                return $indicator;
     8464        }
     8465        echo $indicator;
     8466}
     8467
     8468/**
     8469 * Create a message to explain required form fields.
     8470 *
     8471 * @since 6.0.0
     8472 *
     8473 * @param string $space_before Space character, entity or empty string to add before glyph. Default ' '.
     8474 * @param bool   $echo         Whether to output the result or instead return it. Default false.
     8475 * @return string Message text and glyph wrapped in a `span` tag.
     8476 */
     8477function wp_required_field_message( $space_before = ' ', $echo = false ) {
     8478        $message = sprintf(
     8479                '%1$s<span class="required-field-message" aria-hidden="true">%2$s</span>',
     8480                esc_html( $space_before ),
     8481                /* translators: %s: Asterisk symbol (*). */
     8482                sprintf( __( 'Required fields are marked %s' ), wp_required_field_indicator( '' ) ),
     8483        );
     8484
     8485        if ( ! $echo ) {
     8486                return $message;
     8487        }
     8488        echo $message;
     8489}
     8490
     8491/**
    84458492 * Sorts the keys of an array alphabetically.
    84468493 * The array is passed by reference so it doesn't get returned
    84478494 * which mimics the behaviour of ksort.