<!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>[35819] branches/4.4/src/wp-admin/includes: List Tables: Revert [34728] and [35482].</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 { 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/35819">35819</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/35819","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>ocean90</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-12-07 20:07:20 +0000 (Mon, 07 Dec 2015)</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'>List Tables: Revert <a href="https://core.trac.wordpress.org/changeset/34728">[34728]</a> and <a href="https://core.trac.wordpress.org/changeset/35482">[35482]</a>.
Part of <a href="https://core.trac.wordpress.org/changeset/34728">[34728]</a> was already reverted in <a href="https://core.trac.wordpress.org/changeset/35682">[35682]</a>, but the default values still made it impossible to set a default ordering for custom post types.
Merge of <a href="https://core.trac.wordpress.org/changeset/35818">[35818]</a> for the 4.4 branch.
See <a href="https://core.trac.wordpress.org/ticket/25493">#25493</a>.
Fixes <a href="https://core.trac.wordpress.org/ticket/34825">#34825</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches44srcwpadminincludesclasswplisttablephp">branches/4.4/src/wp-admin/includes/class-wp-list-table.php</a></li>
<li><a href="#branches44srcwpadminincludespostphp">branches/4.4/src/wp-admin/includes/post.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches44srcwpadminincludesclasswplisttablephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.4/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">--- branches/4.4/src/wp-admin/includes/class-wp-list-table.php 2015-12-07 19:15:16 UTC (rev 35818)
+++ branches/4.4/src/wp-admin/includes/class-wp-list-table.php 2015-12-07 20:07:20 UTC (rev 35819)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1037,38 +1037,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 'orderby' is set, return it.
- *
- * @access protected
- * @since 4.4.0
- *
- * @return string The value of 'orderby' or empty string.
- */
- protected function get_orderby() {
- if ( isset( $_GET['orderby'] ) ) {
- return $_GET['orderby'];
- }
-
- return '';
- }
-
- /**
- * If 'order' is 'desc', return it. Else return 'asc'.
- *
- * @access protected
- * @since 4.4.0
- *
- * @return string 'desc' or 'asc'.
- */
- protected function get_order() {
- if ( isset( $_GET['order'] ) && 'desc' === $_GET['order'] ) {
- return 'desc';
- }
-
- return 'asc';
- }
-
- /**
</del><span class="cx" style="display: block; padding: 0 10px"> * Print column headers, accounting for hidden and sortable columns.
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -1084,9 +1052,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $current_url = set_url_scheme( 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $current_url = remove_query_arg( 'paged', $current_url );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $current_orderby = $this->get_orderby();
- $current_order = $this->get_order();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $_GET['orderby'] ) ) {
+ $current_orderby = $_GET['orderby'];
+ } else {
+ $current_orderby = '';
+ }
</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 ( isset( $_GET['order'] ) && 'desc' === $_GET['order'] ) {
+ $current_order = 'desc';
+ } else {
+ $current_order = 'asc';
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $columns['cb'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> static $cb_counter = 1;
</span><span class="cx" style="display: block; padding: 0 10px"> $columns['cb'] = '<label class="screen-reader-text" for="cb-select-all-' . $cb_counter . '">' . __( 'Select All' ) . '</label>'
</span></span></pre></div>
<a id="branches44srcwpadminincludespostphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.4/src/wp-admin/includes/post.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.4/src/wp-admin/includes/post.php 2015-12-07 19:15:16 UTC (rev 35818)
+++ branches/4.4/src/wp-admin/includes/post.php 2015-12-07 20:07:20 UTC (rev 35819)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1008,16 +1008,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $orderby = $q['orderby'];
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( isset( $q['post_status'] ) && in_array( $q['post_status'], array( 'pending', 'draft' ) ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $orderby = 'modified';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( ! is_post_type_hierarchical( $post_type ) ) {
- $orderby = 'date';
</del><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"> if ( isset( $q['order'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $order = $q['order'];
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( isset( $q['post_status'] ) && 'pending' == $q['post_status'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $order = 'ASC';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } else {
- $order = 'desc';
</del><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"> $per_page = "edit_{$post_type}_per_page";
</span></span></pre>
</div>
</div>
</body>
</html>