From 37363646c6d3b4a92daeccd727ec91edb5b6dceb Mon Sep 17 00:00:00 2001
From: Peter Westwood <westi@git.wordpress.org>
Date: Wed, 10 Dec 2008 21:48:41 +0000
Subject: [PATCH] Sort page_parent dropdown by menu_order. Fixes #8549.

git-svn-id: https://develop.svn.wordpress.org/trunk@10181 602fd350-edb4-49c9-b593-d223f7449a82
---
 wp-admin/edit-page-form.php    | 2 +-
 wp-admin/includes/template.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/wp-admin/edit-page-form.php b/wp-admin/edit-page-form.php
index 8233055958..4c1b97e17b 100644
--- a/wp-admin/edit-page-form.php
+++ b/wp-admin/edit-page-form.php
@@ -270,7 +270,7 @@ function page_attributes_meta_box($post){
 ?>
 <h5><?php _e('Parent') ?></h5>
 <label class="hidden" for="parent_id"><?php _e('Page Parent') ?></label>
-<?php wp_dropdown_pages(array('exclude_tree' => $post->ID, 'selected' => $post->post_parent, 'name' => 'parent_id', 'show_option_none' => __('Main Page (no parent)'))); ?>
+<?php wp_dropdown_pages(array('exclude_tree' => $post->ID, 'selected' => $post->post_parent, 'name' => 'parent_id', 'show_option_none' => __('Main Page (no parent)'), 'sort_column'=> 'menu_order')); ?>
 <p><?php _e('You can arrange your pages in hierarchies, for example you could have an &#8220;About&#8221; page that has &#8220;Life Story&#8221; and &#8220;My Dog&#8221; pages under it. There are no limits to how deeply nested you can make pages.'); ?></p>
 <?php
 	if ( 0 != count( get_page_templates() ) ) {
diff --git a/wp-admin/includes/template.php b/wp-admin/includes/template.php
index e3b9b48197..9dd6848588 100644
--- a/wp-admin/includes/template.php
+++ b/wp-admin/includes/template.php
@@ -1050,7 +1050,7 @@ function inline_edit_row( $type ) {
 		<label>
 			<span class="title"><?php _e( 'Parent' ); ?></span>
 <?php
-	$dropdown_args = array('selected' => $post->post_parent, 'name' => 'post_parent', 'show_option_none' => __('Main Page (no parent)'), 'option_none_value' => 0);
+	$dropdown_args = array('selected' => $post->post_parent, 'name' => 'post_parent', 'show_option_none' => __('Main Page (no parent)'), 'option_none_value' => 0, 'sort_column'=> 'menu_order');
 	if ( $bulk )
 		$dropdown_args['show_option_no_change'] =  __('- No Change -');
 	$dropdown_args = apply_filters('quick_edit_dropdown_pages_args', $dropdown_args);