<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[15501] trunk: Safer hierarchical display check.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15501">15501</a></dd>
<dt>Author</dt> <dd>scribu</dd>
<dt>Date</dt> <dd>2010-08-16 01:36:21 +0000 (Mon, 16 Aug 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Safer hierarchical display check. Fixes <a href="http://trac.wordpress.org/ticket/14600">#14600</a>; See <a href="http://trac.wordpress.org/ticket/14579">#14579</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesdefaultlisttablesphp">trunk/wp-admin/includes/default-list-tables.php</a></li>
<li><a href="#trunkwpincludesqueryphp">trunk/wp-includes/query.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesdefaultlisttablesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/default-list-tables.php (15500 => 15501)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/default-list-tables.php 2010-08-15 22:36:17 UTC (rev 15500)
+++ trunk/wp-admin/includes/default-list-tables.php 2010-08-16 01:36:21 UTC (rev 15501)
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx">
</span><span class="cx"> $avail_post_stati = wp_edit_posts_query();
</span><span class="cx">
</span><del>- $this->hierarchical_display = ( $post_type_object->hierarchical && 0 === strpos( get_query_var( 'orderby' ), 'menu_order' ) );
</del><ins>+ $this->hierarchical_display = ( $post_type_object->hierarchical && 'menu_order title' == $wp_query->query['orderby'] );
</ins><span class="cx">
</span><span class="cx"> $total_items = $this->hierarchical_display ? $wp_query->post_count : $wp_query->found_posts;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludesqueryphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/query.php (15500 => 15501)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/query.php 2010-08-15 22:36:17 UTC (rev 15500)
+++ trunk/wp-includes/query.php 2010-08-16 01:36:21 UTC (rev 15501)
</span><span class="lines">@@ -1246,11 +1246,7 @@
</span><span class="cx"> function parse_query($query) {
</span><span class="cx"> if ( !empty($query) || !isset($this->query) ) {
</span><span class="cx"> $this->init();
</span><del>- if ( is_array($query) )
- $this->query_vars = $query;
- else
- parse_str($query, $this->query_vars);
- $this->query = $query;
</del><ins>+ $this->query = $this->query_vars = wp_parse_args($query);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $this->query_vars = $this->fill_query_vars($this->query_vars);
</span></span></pre>
</div>
</div>
</body>
</html>