From 724fc1b7e518e536bbaa39910b6153e0d8a31206 Mon Sep 17 00:00:00 2001
From: Dion Hulse <dd32@git.wordpress.org>
Date: Sat, 20 Mar 2010 02:37:16 +0000
Subject: [PATCH] Fix notice in Page Templates when a Template is not set for
 the current page.

git-svn-id: https://develop.svn.wordpress.org/trunk@13776 602fd350-edb4-49c9-b593-d223f7449a82
---
 wp-admin/includes/meta-boxes.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/wp-admin/includes/meta-boxes.php b/wp-admin/includes/meta-boxes.php
index 067ff943f9..f98d199dbc 100644
--- a/wp-admin/includes/meta-boxes.php
+++ b/wp-admin/includes/meta-boxes.php
@@ -511,18 +511,20 @@ function post_revisions_meta_box($post) {
  *
  * @param object $post
  */
-function page_attributes_meta_box($post){
+function page_attributes_meta_box($post) {
 ?>
 <h5><?php _e('Parent') ?></h5>
 <label class="screen-reader-text" 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)'), 'sort_column'=> 'menu_order, post_title')); ?>
 <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() ) ) { ?>
+	if ( 0 != count( get_page_templates() ) ) {
+		$template = !empty($post->page_template) ? $post->page_template : false;
+		?>
 <h5><?php _e('Template') ?></h5>
 <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($post->page_template); ?>
+<?php page_template_dropdown($template); ?>
 </select>
 <p><?php _e('Some themes have custom templates you can use for certain pages that might have additional features or custom layouts. If so, you&#8217;ll see them above.'); ?></p>
 <?php