<!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>[48424] trunk/src/wp-admin/includes: Administration: Bring some consistency to handling list table view modes.</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/48424">48424</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/48424","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-10 16:02:00 +0000 (Fri, 10 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: Bring some consistency to handling list table view modes.
* Remove duplicate variables and DocBlocks.
* Add missing description for the `$mode` global.
* Use sentence case for "Compact view" and "Extended view" labels.
Follow-up to <a href="https://core.trac.wordpress.org/changeset/48398">[48398]</a>, <a href="https://core.trac.wordpress.org/changeset/48423">[48423]</a>.
Props afercia, Offereins, SergeyBiryukov.
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="#trunksrcwpadminincludesclasswpmedialisttablephp">trunk/src/wp-admin/includes/class-wp-media-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpmssiteslisttablephp">trunk/src/wp-admin/includes/class-wp-ms-sites-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpmsuserslisttablephp">trunk/src/wp-admin/includes/class-wp-ms-users-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="#trunksrcwpadminincludesdashboardphp">trunk/src/wp-admin/includes/dashboard.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-10 16:00:42 UTC (rev 48423)
+++ trunk/src/wp-admin/includes/class-wp-comments-list-table.php 2020-07-10 16:02:00 UTC (rev 48424)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -80,12 +80,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @global int $post_id
</span><span class="cx" style="display: block; padding: 0 10px"> * @global string $comment_status
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global string $comment_type
</ins><span class="cx" style="display: block; padding: 0 10px"> * @global string $search
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @global string $comment_type
</del><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function prepare_items() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $post_id, $comment_status, $search, $comment_type;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ global $post_id, $comment_status, $comment_type, $search;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $_REQUEST['mode'] ) ) {
+ $mode = 'extended' === $_REQUEST['mode'] ? 'extended' : 'list';
+ set_user_setting( 'posts_list_mode', $mode );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $comment_status = isset( $_REQUEST['comment_status'] ) ? $_REQUEST['comment_status'] : 'all';
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! in_array( $comment_status, array( 'all', 'mine', 'moderated', 'approved', 'spam', 'trash' ), true ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $comment_status = 'all';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -124,13 +129,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $start += $_REQUEST['offset'];
</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">- if ( ! empty( $_REQUEST['mode'] ) ) {
- $mode = 'extended' === $_REQUEST['mode'] ? 'extended' : 'list';
- set_user_setting( 'posts_list_mode', $mode );
- } else {
- $mode = get_user_setting( 'posts_list_mode', 'list' );
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> $status_map = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'mine' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> 'moderated' => 'hold',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -759,21 +757,34 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $actions = apply_filters( 'comment_row_actions', array_filter( $actions ), $comment );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $always_visible = false;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $mode = get_user_setting( 'posts_list_mode', 'list' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ $mode = get_user_setting( 'posts_list_mode', 'list' );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( 'extended' === $mode ) {
</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $i = 0;
</del><span class="cx" style="display: block; padding: 0 10px"> $out .= '<div class="' . ( $always_visible ? 'row-actions visible' : 'row-actions' ) . '">';
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ $i = 0;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $actions as $action => $link ) {
</span><span class="cx" style="display: block; padding: 0 10px"> ++$i;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ( ( ( 'approve' === $action || 'unapprove' === $action ) && 2 === $i ) || 1 === $i ) ? $sep = '' : $sep = ' | ';
</del><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Reply and quickedit need a hide-if-no-js span when not added with ajax.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ( ( 'approve' === $action || 'unapprove' === $action ) && 2 === $i )
+ || 1 === $i
+ ) {
+ $sep = '';
+ } else {
+ $sep = ' | ';
+ }
+
+ // Reply and quickedit need a hide-if-no-js span when not added with Ajax.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ( 'reply' === $action || 'quickedit' === $action ) && ! wp_doing_ajax() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $action .= ' hide-if-no-js';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( ( 'untrash' === $action && 'trash' === $the_comment_status ) || ( 'unspam' === $action && 'spam' === $the_comment_status ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( ( 'untrash' === $action && 'trash' === $the_comment_status )
+ || ( 'unspam' === $action && 'spam' === $the_comment_status )
+ ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( '1' == get_comment_meta( $comment->comment_ID, '_wp_trash_meta_status', true ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $action .= ' approve';
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -783,6 +794,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $out .= "<span class='$action'>$sep$link</span>";
</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"> $out .= '</div>';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $out .= '<button type="button" class="toggle-row"><span class="screen-reader-text">' . __( 'Show more details' ) . '</span></button>';
</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-10 16:00:42 UTC (rev 48423)
+++ trunk/src/wp-admin/includes/class-wp-list-table.php 2020-07-10 16:02:00 UTC (rev 48424)
</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' ),
+ 'extended' => __( '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">@@ -517,7 +517,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> protected function row_actions( $actions, $always_visible = false ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $action_count = count( $actions );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $i = 0;
</del><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $action_count ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return '';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -524,16 +523,23 @@
</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"> $mode = get_user_setting( 'posts_list_mode', 'list' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( 'extended' === $mode ) {
</span><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="cx" style="display: block; padding: 0 10px"> $out = '<div class="' . ( $always_visible ? 'row-actions visible' : 'row-actions' ) . '">';
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ $i = 0;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $actions as $action => $link ) {
</span><span class="cx" style="display: block; padding: 0 10px"> ++$i;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ( $i == $action_count ) ? $sep = '' : $sep = ' | ';
- $out .= "<span class='$action'>$link$sep</span>";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ $sep = ( $i < $action_count ) ? ' | ' : '';
+
+ $out .= "<span class='$action'>$link$sep</span>";
</ins><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"> $out .= '</div>';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $out .= '<button type="button" class="toggle-row"><span class="screen-reader-text">' . __( 'Show more details' ) . '</span></button>';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1252,20 +1258,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string[] Array of CSS classes for the table tag.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> protected function get_table_classes() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $mode = get_user_setting( 'posts_list_mode', 'list' );
- $mode_class = 'extended' === $mode ? 'table-view-extended' : 'table-view-list';
- $mode = get_user_setting( 'posts_list_mode', 'list' );
- /**
- * Filters the current view mode.
- *
- * @since 5.5.0
- *
- * @param string $mode The current selected mode. Default value of
- * posts_list_mode user setting.
- */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $mode = get_user_setting( 'posts_list_mode', 'list' );
+
+ /** This filter is documented in wp-admin/includes/class-wp-screen.php */
</ins><span class="cx" style="display: block; padding: 0 10px"> $mode = apply_filters( 'table_view_mode', $mode );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $mode_class = 'extended' === $mode ? 'table-view-extended' : 'table-view-' . $mode;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $mode_class = esc_attr( 'table-view-' . $mode );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return array( 'widefat', 'fixed', 'striped', $mode_class, $this->_args['plural'] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpmedialisttablephp"></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-media-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-media-list-table.php 2020-07-10 16:00:42 UTC (rev 48423)
+++ trunk/src/wp-admin/includes/class-wp-media-list-table.php 2020-07-10 16:02:00 UTC (rev 48424)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -61,14 +61,16 @@
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global string $mode List table view mode.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @global WP_Query $wp_query WordPress Query object.
</span><span class="cx" style="display: block; padding: 0 10px"> * @global array $post_mime_types
</span><span class="cx" style="display: block; padding: 0 10px"> * @global array $avail_post_mime_types
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @global string $mode
</del><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function prepare_items() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $wp_query, $post_mime_types, $avail_post_mime_types, $mode;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ global $mode, $wp_query, $post_mime_types, $avail_post_mime_types;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $mode = empty( $_REQUEST['mode'] ) ? 'list' : $_REQUEST['mode'];
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Exclude attachments scheduled for deletion in the next two hours
</span><span class="cx" style="display: block; padding: 0 10px"> // if they are for zip packages for interrupted or failed updates.
</span><span class="cx" style="display: block; padding: 0 10px"> // See File_Upload_Upgrader class.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -96,8 +98,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->is_trash = isset( $_REQUEST['attachment-filter'] ) && 'trash' === $_REQUEST['attachment-filter'];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $mode = empty( $_REQUEST['mode'] ) ? 'list' : $_REQUEST['mode'];
-
</del><span class="cx" style="display: block; padding: 0 10px"> $this->set_pagination_args(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'total_items' => $wp_query->found_posts,
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpmssiteslisttablephp"></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-ms-sites-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-ms-sites-list-table.php 2020-07-10 16:00:42 UTC (rev 48423)
+++ trunk/src/wp-admin/includes/class-wp-ms-sites-list-table.php 2020-07-10 16:02:00 UTC (rev 48424)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -62,12 +62,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.1.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global string $mode List table view mode.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @global string $s
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @global string $mode
</del><span class="cx" style="display: block; padding: 0 10px"> * @global wpdb $wpdb WordPress database abstraction object.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function prepare_items() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $s, $mode, $wpdb;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ global $mode, $s, $wpdb;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $_REQUEST['mode'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $mode = 'excerpt' === $_REQUEST['mode'] ? 'excerpt' : 'list';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -576,7 +576,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">- * @global string $mode
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global string $mode List table view mode.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function display_rows() {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $this->items as $blog ) {
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpmsuserslisttablephp"></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-ms-users-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-ms-users-list-table.php 2020-07-10 16:00:42 UTC (rev 48423)
+++ trunk/src/wp-admin/includes/class-wp-ms-users-list-table.php 2020-07-10 16:02:00 UTC (rev 48424)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -24,13 +24,20 @@
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global string $mode List table view mode.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @global string $usersearch
</span><span class="cx" style="display: block; padding: 0 10px"> * @global string $role
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @global string $mode
</del><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function prepare_items() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $usersearch, $role, $mode;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ global $mode, $usersearch, $role;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $_REQUEST['mode'] ) ) {
+ $mode = 'excerpt' === $_REQUEST['mode'] ? 'excerpt' : 'list';
+ set_user_setting( 'network_users_list_mode', $mode );
+ } else {
+ $mode = get_user_setting( 'network_users_list_mode', 'list' );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $usersearch = isset( $_REQUEST['s'] ) ? wp_unslash( trim( $_REQUEST['s'] ) ) : '';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $users_per_page = $this->get_items_per_page( 'users_network_per_page' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -83,13 +90,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $args['order'] = $_REQUEST['order'];
</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">- if ( ! empty( $_REQUEST['mode'] ) ) {
- $mode = 'excerpt' === $_REQUEST['mode'] ? 'excerpt' : 'list';
- set_user_setting( 'network_users_list_mode', $mode );
- } else {
- $mode = get_user_setting( 'network_users_list_mode', 'list' );
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> /** This filter is documented in wp-admin/includes/class-wp-users-list-table.php */
</span><span class="cx" style="display: block; padding: 0 10px"> $args = apply_filters( 'users_list_table_query_args', $args );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -422,13 +422,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $actions = apply_filters( 'ms_user_list_site_actions', $actions, $val->userblog_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $i = 0;
</del><span class="cx" style="display: block; padding: 0 10px"> $action_count = count( $actions );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ $i = 0;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $actions as $action => $link ) {
</span><span class="cx" style="display: block; padding: 0 10px"> ++$i;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $sep = ( $i == $action_count ) ? '' : ' | ';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ $sep = ( $i < $action_count ) ? ' | ' : '';
+
</ins><span class="cx" style="display: block; padding: 0 10px"> echo "<span class='$action'>$link$sep</span>";
</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"> echo '</small></span><br/>';
</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="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-10 16:00:42 UTC (rev 48423)
+++ trunk/src/wp-admin/includes/class-wp-posts-list-table.php 2020-07-10 16:02:00 UTC (rev 48424)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -135,14 +135,21 @@
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global string $mode List table view mode.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @global array $avail_post_stati
</span><span class="cx" style="display: block; padding: 0 10px"> * @global WP_Query $wp_query WordPress Query object.
</span><span class="cx" style="display: block; padding: 0 10px"> * @global int $per_page
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @global string $mode
</del><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function prepare_items() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- global $avail_post_stati, $wp_query, $per_page, $mode;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ global $mode, $avail_post_stati, $wp_query, $per_page;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $_REQUEST['mode'] ) ) {
+ $mode = 'extended' === $_REQUEST['mode'] ? 'extended' : 'list';
+ set_user_setting( 'posts_list_mode', $mode );
+ } else {
+ $mode = get_user_setting( 'posts_list_mode', 'list' );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Is going to call wp().
</span><span class="cx" style="display: block; padding: 0 10px"> $avail_post_stati = wp_edit_posts_query();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -177,13 +184,6 @@
</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">- if ( ! empty( $_REQUEST['mode'] ) ) {
- $mode = 'extended' === $_REQUEST['mode'] ? 'extended' : 'list';
- set_user_setting( 'posts_list_mode', $mode );
- } else {
- $mode = get_user_setting( 'posts_list_mode', 'list' );
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> $this->is_trash = isset( $_REQUEST['post_status'] ) && 'trash' === $_REQUEST['post_status'];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->set_pagination_args(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -595,23 +595,17 @@
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global string $mode List table view mode.
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return array
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> protected function get_table_classes() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $mode = get_user_setting( 'posts_list_mode', 'list' );
- $mode_class = 'extended' === $mode ? 'table-view-extended' : 'table-view-list';
- $mode = get_user_setting( 'posts_list_mode', 'list' );
- /**
- * Filters the current view mode.
- *
- * @since 5.5.0
- *
- * @param string $mode The current selected mode. Default value of
- * posts_list_mode user setting.
- */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ global $mode;
+
+ /** This filter is documented in wp-admin/includes/class-wp-screen.php */
</ins><span class="cx" style="display: block; padding: 0 10px"> $mode = apply_filters( 'table_view_mode', $mode );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $mode_class = 'extended' === $mode ? 'table-view-extended' : 'table-view-' . $mode;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $mode_class = esc_attr( 'table-view-' . $mode );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return array( 'widefat', 'fixed', 'striped', $mode_class, is_post_type_hierarchical( $this->screen->post_type ) ? 'pages' : 'posts' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpadminincludesdashboardphp"></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/dashboard.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/dashboard.php 2020-07-10 16:00:42 UTC (rev 48423)
+++ trunk/src/wp-admin/includes/dashboard.php 2020-07-10 16:02:00 UTC (rev 48424)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -756,10 +756,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $actions = apply_filters( 'comment_row_actions', array_filter( $actions ), $comment );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $i = 0;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $actions as $action => $link ) {
</span><span class="cx" style="display: block; padding: 0 10px"> ++$i;
</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 ( ( ( 'approve' === $action || 'unapprove' === $action ) && 2 === $i ) || 1 === $i ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ( ( 'approve' === $action || 'unapprove' === $action ) && 2 === $i )
+ || 1 === $i
+ ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $sep = '';
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $sep = ' | ';
</span></span></pre>
</div>
</div>
</body>
</html>