Ticket #38655: 38655.2.diff

src/wp-admin/js/inline-edit-post.js

@@ -117 +117 @@
                         $( 'tr.inline-editor textarea[data-wp-taxonomy]' ).each( function ( i, element ) {
                                 $( element ).wpTagsSuggest();
                         } );
                 }
                 $('html, body').animate( { scrollTop: 0 }, 'fast' );
         },
 
         edit : function(id) {
                 var t = this, fields, editRow, rowData, status, pageOpt, pageLevel, nextPage, pageLoop = true, nextLevel, f, val, pw;
                 t.revert();
 
                 if ( typeof(id) === 'object' ) {
                         id = t.getId(id);
                 }
 
-                fields = ['post_title', 'post_name', 'post_author', '_status', 'jj', 'mm', 'aa', 'hh', 'mn', 'ss', 'post_password', 'post_format', 'menu_order'];
+                fields = ['post_title', 'post_name', 'post_author', '_status', 'jj', 'mm', 'aa', 'hh', 'mn', 'ss', 'post_password', 'post_format', 'menu_order', 'page_template'];
                 if ( t.type === 'page' ) {
-                        fields.push('post_parent', 'page_template');
+                        fields.push('post_parent');
                 }
 
                 // add the new edit row with an extra blank row underneath to maintain zebra striping.
                 editRow = $('#inline-edit').clone(true);
                 $( 'td', editRow ).attr( 'colspan', $( 'th:visible, td:visible', '.widefat:first thead' ).length );
 
                 $(t.what+id).removeClass('is-expanded').hide().after(editRow).after('<tr class="hidden"></tr>');
 
                 // populate the data
                 rowData = $('#inline_'+id);
                 if ( !$(':input[name="post_author"] option[value="' + $('.post_author', rowData).text() + '"]', editRow).val() ) {
                         // author no longer has edit caps, so we need to add them to the list of authors
                         $(':input[name="post_author"]', editRow).prepend('<option value="' + $('.post_author', rowData).text() + '">' + $('#' + t.type + '-' + id + ' .author').text() + '</option>');
                 }
                 if ( $( ':input[name="post_author"] option', editRow ).length === 1 ) {

src/wp-admin/includes/class-wp-posts-list-table.php

@@ -1543 +1543 @@
                 endif; // page-attributes
         ?>
 
         <?php if ( 0 < count( get_page_templates( null, $screen->post_type ) ) ) : ?>
                 <label>
                         <span class="title"><?php _e( 'Template' ); ?></span>
                         <select name="page_template">
 <?php   if ( $bulk ) : ?>
                                 <option value="-1"><?php _e( '&mdash; No Change &mdash;' ); ?></option>
 <?php   endif; // $bulk ?>
                 <?php
                                 /** This filter is documented in wp-admin/includes/meta-boxes.php */
                                 $default_title = apply_filters( 'default_page_template_title',  __( 'Default Template' ), 'quick-edit' );
                 ?>
                                 <option value="default"><?php echo esc_html( $default_title ); ?></option>
-                                <?php page_template_dropdown( $post->page_template, $screen->post_type ) ?>
+                                <?php page_template_dropdown( '', $screen->post_type ) ?>
                         </select>
                 </label>
         <?php endif; ?>
 
         <?php if ( count( $flat_taxonomies ) && !$bulk ) : ?>
 
         <?php foreach ( $flat_taxonomies as $taxonomy ) : ?>
                 <?php if ( current_user_can( $taxonomy->cap->assign_terms ) ) :
                         $taxonomy_name = esc_attr( $taxonomy->name );
 
                         ?>
                         <label class="inline-edit-tags">
                                 <span class="title"><?php echo esc_html( $taxonomy->labels->name ) ?></span>
                                 <textarea data-wp-taxonomy="<?php echo $taxonomy_name; ?>" cols="22" rows="1" name="tax_input[<?php echo $taxonomy_name; ?>]" class="tax_input_<?php echo $taxonomy_name; ?>"></textarea>
                         </label>