Ticket #21774: 21774.diff

wp-admin/includes/meta-boxes.php

@@ -550 +550 @@
  * @param object $post
  */
 function page_attributes_meta_box($post) {
+        if ( 'page' == $post->post_type && 0 != count( get_page_templates() ) ) {
+                $template = !empty($post->page_template) ? $post->page_template : false;
+                ?>
+<p><strong><?php _e('Template') ?></strong></p>
+<label class="screen-reader-text" for="page_template"><?php _e('Page Template') ?></label><select name="page_template" id="page_template">
+<option value='default'><?php _e('Default Template'); ?></option>
+<?php page_template_dropdown($template); ?>
+</select>
+<?php
+        }
+
         $post_type_object = get_post_type_object($post->post_type);
         if ( $post_type_object->hierarchical ) {
                 $dropdown_args = array(
@@ -561 +572 @@
                         'sort_column'      => 'menu_order, post_title',
                         'echo'             => 0,
                 );
-
                 $dropdown_args = apply_filters( 'page_attributes_dropdown_pages_args', $dropdown_args, $post );
                 $pages = wp_dropdown_pages( $dropdown_args );
                 if ( ! empty($pages) ) {
@@ -572 +582 @@
 <?php
                 } // end empty pages check
         } // end hierarchical check.
-        if ( 'page' == $post->post_type && 0 != count( get_page_templates() ) ) {
-                $template = !empty($post->page_template) ? $post->page_template : false;
-                ?>
-<p><strong><?php _e('Template') ?></strong></p>
-<label class="screen-reader-text" for="page_template"><?php _e('Page Template') ?></label><select name="page_template" id="page_template">
-<option value='default'><?php _e('Default Template'); ?></option>
-<?php page_template_dropdown($template); ?>
-</select>
-<?php
-        } ?>
+         ?>
 <p><strong><?php _e('Order') ?></strong></p>
 <p><label class="screen-reader-text" for="menu_order"><?php _e('Order') ?></label><input name="menu_order" type="text" size="4" id="menu_order" value="<?php echo esc_attr($post->menu_order) ?>" /></p>
 <p><?php if ( 'page' == $post->post_type ) _e( 'Need help? Use the Help tab in the upper right of your screen.' ); ?></p>