Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-06-23 13:24:57 +02:00
Code Issues Projects Releases Wiki Activity

Administration: Restore the excerpt key for the Extended view mode for backward compatibility for now.

Browse Source 
Props Offereins.
See #49715.
Built from https://develop.svn.wordpress.org/trunk@48450


git-svn-id: http://core.svn.wordpress.org/trunk@48219 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2020-07-12 11:36:04 +00:00
parent 1556ecc000
commit c4543704e2
5 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-admin/includes/class-wp-comments-list-table.php
View File

@ -87,7 +87,7 @@ class WP_Comments_List_Table extends WP_List_Table {
global $post_id, $comment_status, $comment_type, $search;
if ( ! empty( $_REQUEST['mode'] ) ) {
$mode = 'extended' === $_REQUEST['mode'] ? 'extended' : 'list';
$mode = 'excerpt' === $_REQUEST['mode'] ? 'excerpt' : 'list';
set_user_setting( 'posts_list_mode', $mode );
}
@ -760,7 +760,7 @@ class WP_Comments_List_Table extends WP_List_Table {
$mode = get_user_setting( 'posts_list_mode', 'list' );
if ( 'extended' === $mode ) {
if ( 'excerpt' === $mode ) {
$always_visible = true;
}

7
wp-admin/includes/class-wp-list-table.php
View File

@ -166,8 +166,8 @@ class WP_List_Table {
if ( empty( $this->modes ) ) {
$this->modes = array(
'list' => __( 'Compact view' ),
'extended' => __( 'Extended view' ),
'list' => __( 'Compact view' ),
'excerpt' => __( 'Extended view' ),
);
}
}
@ -524,7 +524,7 @@ class WP_List_Table {
$mode = get_user_setting( 'posts_list_mode', 'list' );
if ( 'extended' === $mode ) {
if ( 'excerpt' === $mode ) {
$always_visible = true;
}
@ -655,6 +655,7 @@ class WP_List_Table {
$classes[] = 'current';
$aria_current = ' aria-current="page"';
}
printf(
"<a href='%s' class='%s' id='view-switch-$mode'$aria_current><span class='screen-reader-text'>%s</span></a>\n",
esc_url( remove_query_arg( 'attachment-filter', add_query_arg( 'mode', $mode ) ) ),

13
wp-admin/includes/class-wp-posts-list-table.php
View File

@ -144,7 +144,7 @@ class WP_Posts_List_Table extends WP_List_Table {
global $mode, $avail_post_stati, $wp_query, $per_page;
if ( ! empty( $_REQUEST['mode'] ) ) {
$mode = 'extended' === $_REQUEST['mode'] ? 'extended' : 'list';
$mode = 'excerpt' === $_REQUEST['mode'] ? 'excerpt' : 'list';
set_user_setting( 'posts_list_mode', $mode );
} else {
$mode = get_user_setting( 'posts_list_mode', 'list' );
@ -1051,7 +1051,10 @@ class WP_Posts_List_Table extends WP_List_Table {
}
echo "</strong>\n";
if ( ! is_post_type_hierarchical( $this->screen->post_type ) && 'extended' === $mode && current_user_can( 'read_post', $post->ID ) ) {
if ( 'excerpt' === $mode
&& ! is_post_type_hierarchical( $this->screen->post_type )
&& current_user_can( 'read_post', $post->ID )
) {
if ( post_password_required( $post ) ) {
echo '<span class="protected-post-excerpt">' . esc_html( get_the_excerpt() ) . '</span>';
} else {
@ -1111,7 +1114,7 @@ class WP_Posts_List_Table extends WP_List_Table {
* @param string $status The status text.
* @param WP_Post $post Post object.
* @param string $column_name The column name.
* @param string $mode The list display mode ('extended' or 'list').
* @param string $mode The list display mode ('excerpt' or 'list').
*/
$status = apply_filters( 'post_date_column_status', $status, $post, 'date', $mode );
@ -1130,7 +1133,7 @@ class WP_Posts_List_Table extends WP_List_Table {
* @param string $t_time The published time.
* @param WP_Post $post Post object.
* @param string $column_name The column name.
* @param string $mode The list display mode ('extended' or 'list').
* @param string $mode The list display mode ('excerpt' or 'list').
*/
echo apply_filters( 'post_date_column_time', $t_time, $post, 'date', $mode );
}
@ -1500,7 +1503,7 @@ class WP_Posts_List_Table extends WP_List_Table {
}
}
$m = ( isset( $mode ) && 'extended' === $mode ) ? 'extended' : 'list';
$m = ( isset( $mode ) && 'excerpt' === $mode ) ? 'excerpt' : 'list';
$can_publish = current_user_can( $post_type_object->cap->publish_posts );
$core_columns = array(
'cb' => true,

2
wp-admin/includes/class-wp-screen.php
View File

@ -1333,7 +1333,7 @@ final class WP_Screen {
<?php _e( 'Compact view' ); ?>
</label>
<label for="excerpt-view-mode">
<input id="excerpt-view-mode" type="radio" name="mode" value="extended" <?php checked( 'extended', $mode ); ?> />
<input id="excerpt-view-mode" type="radio" name="mode" value="excerpt" <?php checked( 'excerpt', $mode ); ?> />
<?php _e( 'Extended view' ); ?>
</label>
<?php

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
*
* @global string $wp_version
*/
$wp_version = '5.5-beta1-48449';
$wp_version = '5.5-beta1-48450';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.