Make WordPress Core

Ticket #37004: 37004.5.diff

File 37004.5.diff, 9.9 KB (added by mihai2u, 8 years ago)
  • src/wp-admin/includes/class-wp-media-list-table.php

    diff --git a/src/wp-admin/includes/class-wp-media-list-table.php b/src/wp-admin/includes/class-wp-media-list-table.php
    index 6e9e362..002c79e 100644
    a b private function _get_row_actions( $post, $att_title ) { 
    678678                                }
    679679                        }
    680680                        $actions['view'] = sprintf(
    681                                 '<a href="%s" aria-label="%s" rel="permalink">%s</a>',
     681                                '<a href="%s" aria-label="%s" rel="bookmark">%s</a>',
    682682                                get_permalink( $post->ID ),
    683683                                /* translators: %s: attachment title */
    684684                                esc_attr( sprintf( __( 'View &#8220;%s&#8221;' ), $att_title ) ),
    private function _get_row_actions( $post, $att_title ) { 
    737737                        }
    738738                        if ( ! $this->is_trash ) {
    739739                                $actions['view'] = sprintf(
    740                                         '<a href="%s" aria-label="%s" rel="permalink">%s</a>',
     740                                        '<a href="%s" aria-label="%s" rel="bookmark">%s</a>',
    741741                                        get_permalink( $post->ID ),
    742742                                        /* translators: %s: attachment title */
    743743                                        esc_attr( sprintf( __( 'View &#8220;%s&#8221;' ), $att_title ) ),
  • src/wp-admin/includes/class-wp-posts-list-table.php

    diff --git a/src/wp-admin/includes/class-wp-posts-list-table.php b/src/wp-admin/includes/class-wp-posts-list-table.php
    index 9881c51..6a4b652 100644
    a b protected function handle_row_actions( $post, $column_name, $primary ) { 
    12881288                                if ( $can_edit_post ) {
    12891289                                        $preview_link = get_preview_post_link( $post );
    12901290                                        $actions['view'] = sprintf(
    1291                                                 '<a href="%s" rel="permalink" aria-label="%s">%s</a>',
     1291                                                '<a href="%s" rel="bookmark" aria-label="%s">%s</a>',
    12921292                                                esc_url( $preview_link ),
    12931293                                                /* translators: %s: post title */
    12941294                                                esc_attr( sprintf( __( 'Preview &#8220;%s&#8221;' ), $title ) ),
    protected function handle_row_actions( $post, $column_name, $primary ) { 
    12971297                                }
    12981298                        } elseif ( 'trash' != $post->post_status ) {
    12991299                                $actions['view'] = sprintf(
    1300                                         '<a href="%s" rel="permalink" aria-label="%s">%s</a>',
     1300                                        '<a href="%s" rel="bookmark" aria-label="%s">%s</a>',
    13011301                                        get_permalink( $post->ID ),
    13021302                                        /* translators: %s: post title */
    13031303                                        esc_attr( sprintf( __( 'View &#8220;%s&#8221;' ), $title ) ),
    public function inline_edit() { 
    13981398
    13991399                <tr id="<?php echo $bulk ? 'bulk-edit' : 'inline-edit'; ?>" class="inline-edit-row inline-edit-row-<?php echo "$hclass inline-edit-" . $screen->post_type;
    14001400                        echo $bulk ? " bulk-edit-row bulk-edit-row-$hclass bulk-edit-{$screen->post_type}" : " quick-edit-row quick-edit-row-$hclass inline-edit-{$screen->post_type}";
    1401                 ?>" style="display: none"><td colspan="<?php echo $this->get_column_count(); ?>" class="colspanchange">
     1401                ?>" style="display: none"><td class="colspanchange">
    14021402
    14031403                <fieldset class="inline-edit-col-left">
    14041404                        <legend class="inline-edit-legend"><?php echo $bulk ? __( 'Bulk Edit' ) : __( 'Quick Edit' ); ?></legend>
  • src/wp-admin/includes/class-wp-screen.php

    diff --git a/src/wp-admin/includes/class-wp-screen.php b/src/wp-admin/includes/class-wp-screen.php
    index de65c86..1f2185d 100644
    a b public function render_per_page_options() { 
    11811181                        <?php if ( $per_page_label ) : ?>
    11821182                                <label for="<?php echo esc_attr( $option ); ?>"><?php echo $per_page_label; ?></label>
    11831183                                <input type="number" step="1" min="1" max="999" class="screen-per-page" name="wp_screen_options[value]"
    1184                                         id="<?php echo esc_attr( $option ); ?>" maxlength="3"
     1184                                        id="<?php echo esc_attr( $option ); ?>"
    11851185                                        value="<?php echo esc_attr( $per_page ); ?>" />
    11861186                        <?php endif; ?>
    11871187                                <input type="hidden" name="wp_screen_options[option]" value="<?php echo esc_attr( $option ); ?>" />
  • src/wp-admin/includes/class-wp-terms-list-table.php

    diff --git a/src/wp-admin/includes/class-wp-terms-list-table.php b/src/wp-admin/includes/class-wp-terms-list-table.php
    index 7d59624..d6a4eec 100644
    a b public function display_rows_or_placeholder() { 
    235235                $terms = get_terms( $taxonomy, $args );
    236236
    237237                if ( empty( $terms ) || ! is_array( $terms ) ) {
    238                         echo '<tr class="no-items"><td class="colspanchange" colspan="' . $this->get_column_count() . '">';
     238                        echo '<tr class="no-items"><td class="colspanchange">';
    239239                        $this->no_items();
    240240                        echo '</td></tr>';
    241241                        return;
  • src/wp-admin/includes/class-wp-users-list-table.php

    diff --git a/src/wp-admin/includes/class-wp-users-list-table.php b/src/wp-admin/includes/class-wp-users-list-table.php
    index 8c80e90..4ba5eef 100644
    a b protected function get_bulk_actions() { 
    258258         */
    259259        protected function extra_tablenav( $which ) {
    260260                $id = 'bottom' === $which ? 'new_role2' : 'new_role';
     261                $button_id = 'bottom' === $which ? 'changeit2' : 'changeit';
    261262        ?>
    262263        <div class="alignleft actions">
    263264                <?php if ( current_user_can( 'promote_users' ) && $this->has_items() ) : ?>
    protected function extra_tablenav( $which ) { 
    267268                        <?php wp_dropdown_roles(); ?>
    268269                </select>
    269270        <?php
    270                         submit_button( __( 'Change' ), '', 'changeit', false );
     271                        submit_button( __( 'Change' ), '', $button_id, false );
    271272                endif;
    272273
    273274                /**
    protected function extra_tablenav( $which ) { 
    295296         * @return string The bulk action required.
    296297         */
    297298        public function current_action() {
    298                 if ( isset( $_REQUEST['changeit'] ) &&
     299                if ( ( isset( $_REQUEST['changeit'] ) || isset( $_REQUEST['changeit2'] ) ) &&
    299300                        ( ! empty( $_REQUEST['new_role'] ) || ! empty( $_REQUEST['new_role2'] ) ) ) {
    300301                        return 'promote';
    301302                }
  • src/wp-admin/includes/template.php

    diff --git a/src/wp-admin/includes/template.php b/src/wp-admin/includes/template.php
    index a4672fd..89f3a12 100644
    a b function wp_comment_reply( $position = 1, $checkbox = false, $mode = 'single', $ 
    387387?>
    388388<form method="get">
    389389<?php if ( $table_row ) : ?>
    390 <table style="display:none;"><tbody id="com-reply"><tr id="replyrow" class="inline-edit-row" style="display:none;"><td colspan="<?php echo $wp_list_table->get_column_count(); ?>" class="colspanchange">
     390<table style="display:none;"><tbody id="com-reply"><tr id="replyrow" class="inline-edit-row" style="display:none;"><td class="colspanchange">
    391391<?php else : ?>
    392392<div id="com-reply" style="display:none;"><div id="replyrow" style="display:none;">
    393393<?php endif; ?>
  • src/wp-admin/options-general.php

    diff --git a/src/wp-admin/options-general.php b/src/wp-admin/options-general.php
    index 0b54e08..834f027 100644
    a b  
    130130if ( ! empty( $languages ) || ! empty( $translations ) ) {
    131131        ?>
    132132        <tr>
    133                 <th width="33%" scope="row"><label for="WPLANG"><?php _e( 'Site Language' ); ?></label></th>
     133                <th scope="row"><label for="WPLANG"><?php _e( 'Site Language' ); ?></label></th>
    134134                <td>
    135135                        <?php
    136136                        $locale = get_locale();
     
    297297
    298298        echo '<label><input type="radio" name="date_format" id="date_format_custom_radio" value="\c\u\s\t\o\m"';
    299299        checked( $custom );
    300         echo '/> <span class="date-time-text date-time-custom-text">' . __( 'Custom:' ) . '<span class="screen-reader-text"> ' . __( 'enter a custom date format in the following field' ) . '</span></label>' .
     300        echo '/> <span class="date-time-text date-time-custom-text">' . __( 'Custom:' ) . '<span class="screen-reader-text"> ' . __( 'enter a custom date format in the following field' ) . '</span></span></label>' .
    301301                '<label for="date_format_custom" class="screen-reader-text">' . __( 'Custom date format:' ) . '</label>' .
    302                 '<input type="text" name="date_format_custom" id="date_format_custom" value="' . esc_attr( get_option( 'date_format' ) ) . '" class="small-text" /></span>' .
     302                '<input type="text" name="date_format_custom" id="date_format_custom" value="' . esc_attr( get_option( 'date_format' ) ) . '" class="small-text" />' .
    303303                '<span class="screen-reader-text">' . __( 'example:' ) . ' </span> <span class="example">' . date_i18n( get_option( 'date_format' ) ) . '</span>' .
    304304                "<span class='spinner'></span>\n";
    305305?>
     
    333333
    334334        echo '<label><input type="radio" name="time_format" id="time_format_custom_radio" value="\c\u\s\t\o\m"';
    335335        checked( $custom );
    336         echo '/> <span class="date-time-text date-time-custom-text">' . __( 'Custom:' ) . '<span class="screen-reader-text"> ' . __( 'enter a custom time format in the following field' ) . '</span></label>' .
     336        echo '/> <span class="date-time-text date-time-custom-text">' . __( 'Custom:' ) . '<span class="screen-reader-text"> ' . __( 'enter a custom time format in the following field' ) . '</span></span></label>' .
    337337                '<label for="time_format_custom" class="screen-reader-text">' . __( 'Custom time format:' ) . '</label>' .
    338                 '<input type="text" name="time_format_custom" id="time_format_custom" value="' . esc_attr( get_option( 'time_format' ) ) . '" class="small-text" /></span>' .
     338                '<input type="text" name="time_format_custom" id="time_format_custom" value="' . esc_attr( get_option( 'time_format' ) ) . '" class="small-text" />' .
    339339                '<span class="screen-reader-text">' . __( 'example:' ) . ' </span> <span class="example">' . date_i18n( get_option( 'time_format' ) ) . '</span>' .
    340340                "<span class='spinner'></span>\n";
    341341
  • src/wp-admin/options-media.php

    diff --git a/src/wp-admin/options-media.php b/src/wp-admin/options-media.php
    index 698b98d..da67ed0 100644
    a b  
    118118<p class="description"><?php _e('Configuring this is optional. By default, it should be blank.'); ?></p>
    119119</td>
    120120</tr>
    121 <?php endif; ?>
    122121<tr>
    123122<th scope="row" colspan="2" class="th-full">
     123<?php else : ?>
     124<tr>
     125<th scope="row" class="th-full">
     126<?php endif; ?>
    124127<label for="uploads_use_yearmonth_folders">
    125128<input name="uploads_use_yearmonth_folders" type="checkbox" id="uploads_use_yearmonth_folders" value="1"<?php checked('1', get_option('uploads_use_yearmonth_folders')); ?> />
    126129<?php _e('Organize my uploads into month- and year-based folders'); ?>