<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[48450] trunk/src/wp-admin/includes: Administration: Restore the `excerpt` key for the Extended view mode for backward compatibility for now.</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/48450">48450</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/48450","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2020-07-12 11:34:18 +0000 (Sun, 12 Jul 2020)</dd>
</dl>

<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Administration: Restore the `excerpt` key for the Extended view mode for backward compatibility for now.

Props Offereins.
See <a href="https://core.trac.wordpress.org/ticket/49715">#49715</a>.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesclasswpcommentslisttablephp">trunk/src/wp-admin/includes/class-wp-comments-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswplisttablephp">trunk/src/wp-admin/includes/class-wp-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswppostslisttablephp">trunk/src/wp-admin/includes/class-wp-posts-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpscreenphp">trunk/src/wp-admin/includes/class-wp-screen.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesclasswpcommentslisttablephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-comments-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-comments-list-table.php      2020-07-12 11:00:16 UTC (rev 48449)
+++ trunk/src/wp-admin/includes/class-wp-comments-list-table.php        2020-07-12 11:34:18 UTC (rev 48450)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -87,7 +87,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                global $post_id, $comment_status, $comment_type, $search;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! empty( $_REQUEST['mode'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $mode = 'extended' === $_REQUEST['mode'] ? 'extended' : 'list';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $mode = 'excerpt' === $_REQUEST['mode'] ? 'excerpt' : 'list';
</ins><span class="cx" style="display: block; padding: 0 10px">                         set_user_setting( 'posts_list_mode', $mode );
</span><span class="cx" style="display: block; padding: 0 10px">                }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -760,7 +760,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                $mode = get_user_setting( 'posts_list_mode', 'list' );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                if ( 'extended' === $mode ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         if ( 'excerpt' === $mode ) {
</ins><span class="cx" style="display: block; padding: 0 10px">                         $always_visible = true;
</span><span class="cx" style="display: block; padding: 0 10px">                }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswplisttablephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-list-table.php       2020-07-12 11:00:16 UTC (rev 48449)
+++ trunk/src/wp-admin/includes/class-wp-list-table.php 2020-07-12 11:34:18 UTC (rev 48450)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -166,8 +166,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                if ( empty( $this->modes ) ) {
</span><span class="cx" style="display: block; padding: 0 10px">                        $this->modes = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                'list'     => __( 'Compact view' ),
-                               'extended' => __( 'Extended view' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         'list'    => __( 'Compact view' ),
+                               'excerpt' => __( 'Extended view' ),
</ins><span class="cx" style="display: block; padding: 0 10px">                         );
</span><span class="cx" style="display: block; padding: 0 10px">                }
</span><span class="cx" style="display: block; padding: 0 10px">        }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -524,7 +524,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                $mode = get_user_setting( 'posts_list_mode', 'list' );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                if ( 'extended' === $mode ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         if ( 'excerpt' === $mode ) {
</ins><span class="cx" style="display: block; padding: 0 10px">                         $always_visible = true;
</span><span class="cx" style="display: block; padding: 0 10px">                }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -655,6 +655,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                $classes[]    = 'current';
</span><span class="cx" style="display: block; padding: 0 10px">                                $aria_current = ' aria-current="page"';
</span><span class="cx" style="display: block; padding: 0 10px">                        }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px">                         printf(
</span><span class="cx" style="display: block; padding: 0 10px">                                "<a href='%s' class='%s' id='view-switch-$mode'$aria_current><span class='screen-reader-text'>%s</span></a>\n",
</span><span class="cx" style="display: block; padding: 0 10px">                                esc_url( remove_query_arg( 'attachment-filter', add_query_arg( 'mode', $mode ) ) ),
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswppostslisttablephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-posts-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-posts-list-table.php 2020-07-12 11:00:16 UTC (rev 48449)
+++ trunk/src/wp-admin/includes/class-wp-posts-list-table.php   2020-07-12 11:34:18 UTC (rev 48450)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -144,7 +144,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                global $mode, $avail_post_stati, $wp_query, $per_page;
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! empty( $_REQUEST['mode'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        $mode = 'extended' === $_REQUEST['mode'] ? 'extended' : 'list';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $mode = 'excerpt' === $_REQUEST['mode'] ? 'excerpt' : 'list';
</ins><span class="cx" style="display: block; padding: 0 10px">                         set_user_setting( 'posts_list_mode', $mode );
</span><span class="cx" style="display: block; padding: 0 10px">                } else {
</span><span class="cx" style="display: block; padding: 0 10px">                        $mode = get_user_setting( 'posts_list_mode', 'list' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1051,7 +1051,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">                }
</span><span class="cx" style="display: block; padding: 0 10px">                echo "</strong>\n";
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                if ( ! is_post_type_hierarchical( $this->screen->post_type ) && 'extended' === $mode && current_user_can( 'read_post', $post->ID ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         if ( 'excerpt' === $mode
+                       && ! is_post_type_hierarchical( $this->screen->post_type )
+                       && current_user_can( 'read_post', $post->ID )
+               ) {
</ins><span class="cx" style="display: block; padding: 0 10px">                         if ( post_password_required( $post ) ) {
</span><span class="cx" style="display: block; padding: 0 10px">                                echo '<span class="protected-post-excerpt">' . esc_html( get_the_excerpt() ) . '</span>';
</span><span class="cx" style="display: block; padding: 0 10px">                        } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1111,7 +1114,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                 * @param string  $status      The status text.
</span><span class="cx" style="display: block; padding: 0 10px">                 * @param WP_Post $post        Post object.
</span><span class="cx" style="display: block; padding: 0 10px">                 * @param string  $column_name The column name.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                 * @param string  $mode        The list display mode ('extended' or 'list').
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+          * @param string  $mode        The list display mode ('excerpt' or 'list').
</ins><span class="cx" style="display: block; padding: 0 10px">                  */
</span><span class="cx" style="display: block; padding: 0 10px">                $status = apply_filters( 'post_date_column_status', $status, $post, 'date', $mode );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1130,7 +1133,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                 * @param string  $t_time      The published time.
</span><span class="cx" style="display: block; padding: 0 10px">                 * @param WP_Post $post        Post object.
</span><span class="cx" style="display: block; padding: 0 10px">                 * @param string  $column_name The column name.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                 * @param string  $mode        The list display mode ('extended' or 'list').
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+          * @param string  $mode        The list display mode ('excerpt' or 'list').
</ins><span class="cx" style="display: block; padding: 0 10px">                  */
</span><span class="cx" style="display: block; padding: 0 10px">                echo apply_filters( 'post_date_column_time', $t_time, $post, 'date', $mode );
</span><span class="cx" style="display: block; padding: 0 10px">        }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1500,7 +1503,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        }
</span><span class="cx" style="display: block; padding: 0 10px">                }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $m            = ( isset( $mode ) && 'extended' === $mode ) ? 'extended' : 'list';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $m            = ( isset( $mode ) && 'excerpt' === $mode ) ? 'excerpt' : 'list';
</ins><span class="cx" style="display: block; padding: 0 10px">                 $can_publish  = current_user_can( $post_type_object->cap->publish_posts );
</span><span class="cx" style="display: block; padding: 0 10px">                $core_columns = array(
</span><span class="cx" style="display: block; padding: 0 10px">                        'cb'         => true,
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpscreenphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-screen.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-screen.php   2020-07-12 11:00:16 UTC (rev 48449)
+++ trunk/src/wp-admin/includes/class-wp-screen.php     2020-07-12 11:34:18 UTC (rev 48450)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1333,7 +1333,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                        <?php _e( 'Compact view' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px">                                </label>
</span><span class="cx" style="display: block; padding: 0 10px">                                <label for="excerpt-view-mode">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        <input id="excerpt-view-mode" type="radio" name="mode" value="extended" <?php checked( 'extended', $mode ); ?> />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 <input id="excerpt-view-mode" type="radio" name="mode" value="excerpt" <?php checked( 'excerpt', $mode ); ?> />
</ins><span class="cx" style="display: block; padding: 0 10px">                                         <?php _e( 'Extended view' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px">                                </label>
</span><span class="cx" style="display: block; padding: 0 10px">                                <?php
</span></span></pre>
</div>
</div>

</body>
</html>