Ticket #18750: 18750.4.diff

wp-includes/post-template.php

@@ -1250 +1250 @@
 
         global $wp_query;
 
-        $page = $wp_query->get_queried_object();
-        $custom_fields = get_post_custom_values('_wp_page_template',$page->ID);
-        $page_template = $custom_fields[0];
+        $page_template = get_custom_page_template();
 
         // We have no argument passed so just see if a page_template has been specified
         if ( empty( $template ) ) {
@@ -1267 +1265 @@
 }
 
 /**
+ * Get the specific template name for a page.
+ *
+ * @param int $id The page ID to check. If not provided, will use current page
+ * @return string The specific template name if success, bool False on failure
+ */
+function get_custom_page_template( $id = '' ) {
+
+        if ( empty( $id ) && is_page() )
+                $id = get_queried_object_id();
+                
+        return get_post_meta( $id, '_wp_page_template', true );
+}
+
+/**
  * Retrieve formatted date timestamp of a revision (linked to that revisions's page).
  *
  * @package WordPress

wp-includes/theme.php

@@ -947 +947 @@
  */
 function get_page_template() {
         $id = get_queried_object_id();
-        $template = get_post_meta($id, '_wp_page_template', true);
+        $template = get_custom_page_template();
         $pagename = get_query_var('pagename');
 
         if ( !$pagename && $id > 0 ) {