<!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>[14744] trunk/wp-admin/includes/nav-menu.php:
  Order pages in menu box by menu_order, title.</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/14744">14744</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-05-19 14:34:29 +0000 (Wed, 19 May 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>Order pages in menu box by menu_order, title. Props filosofo. see <a href="http://trac.wordpress.org/ticket/13329">#13329</a></pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesnavmenuphp">trunk/wp-admin/includes/nav-menu.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesnavmenuphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/nav-menu.php (14743 => 14744)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/nav-menu.php        2010-05-19 13:07:26 UTC (rev 14743)
+++ trunk/wp-admin/includes/nav-menu.php        2010-05-19 14:34:29 UTC (rev 14744)
</span><span class="lines">@@ -537,32 +537,6 @@
</span><span class="cx"> 
</span><span class="cx">         $num_pages = $get_posts-&gt;max_num_pages;
</span><span class="cx"> 
</span><del>-        if ( isset( $get_posts-&gt;found_posts ) &amp;&amp; ( $get_posts-&gt;found_posts &gt; $get_posts-&gt;post_count ) ) {
-                // somewhat like display_page_row(), let's make sure ancestors show up on paged display
-                $parent_ids = array();
-                $child_ids = array();
-                foreach( (array) $posts as $post ) {
-                        $parent_ids[] = (int) $post-&gt;post_parent;
-                        $child_ids[] = (int) $post-&gt;ID;
-                }
-                $parent_ids = array_unique($parent_ids);
-                $child_ids = array_unique($child_ids);
-
-                $missing_parents = array();
-                do {
-                        foreach( (array) $missing_parents as $missing_parent_id ) {
-                                $missing_parent = get_post($missing_parent_id);
-                                $posts[] = $missing_parent;
-                                $child_ids[] = $missing_parent_id;
-                                $parent_ids[] = $missing_parent-&gt;post_parent;
-                        }
-
-                        $missing_parents = array_filter( array_diff( array_unique( $parent_ids ), array_unique( $child_ids ) ) );
-
-                } while( 0 &lt; count( $missing_parents ) );
-
-        }
-
</del><span class="cx">         $page_links = paginate_links( array(
</span><span class="cx">                 'base' =&gt; add_query_arg(
</span><span class="cx">                         array(
</span><span class="lines">@@ -936,8 +910,7 @@
</span><span class="cx">                 // pages should show most recent
</span><span class="cx">                 if ( 'page' == $object-&gt;name ) {
</span><span class="cx">                         $object-&gt;_default_query = array(
</span><del>-                                'orderby' =&gt; 'post_date',
-                                'order' =&gt; 'DESC',
</del><ins>+                                'orderby' =&gt; 'menu_order title',
</ins><span class="cx">                                 'post_status' =&gt; 'publish',
</span><span class="cx">                         );
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>