Changeset 20075

Timestamp:

03/02/2012 06:56:54 PM (14 years ago)

Author:

nacin

Message:

Introduce get_page_template_slug( $id = null ) to return a page's template (like "showcase.php"). Returns false if post ID is not a page, and an empty string for the default page template. Use the function across core. props billerickson for initial patch. fixes #18750.

Location:

trunk/wp-includes

Files:

• class-wp-xmlrpc-server.php (modified) (1 diff)
• post-template.php (modified) (2 diffs)
• post.php (modified) (1 diff)
• template.php (modified) (2 diffs)

trunk/wp-includes/class-wp-xmlrpc-server.php

@@ -1178 +1178 @@
             $author = get_userdata($page->post_author);
 
-            $page_template = get_post_meta( $page->ID, '_wp_page_template', true );
+            $page_template = get_page_template_slug( $page->ID );
             if ( empty( $page_template ) )
                 $page_template = 'default';

trunk/wp-includes/post-template.php

@@ -488 +488 @@
         if ( is_page_template() ) {
             $classes[] = 'page-template';
-            $classes[] = 'page-template-' . sanitize_html_class( str_replace( '.', '-', get_post_meta( $page_id, '_wp_page_template', true ) ), '' );
+            $classes[] = 'page-template-' . sanitize_html_class( str_replace( '.', '-', get_page_template_slug( $page_id ) ) );
         } else {
             $classes[] = 'page-template-default';
@@ -1242 +1242 @@
  * @return bool False on failure, true if success.
  */
-function is_page_template($template = '') {
-    if (!is_page()) {
+function is_page_template( $template = '' ) {
+    if ( ! is_page() )
         return false;
-    }
-
-    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];
-
-    // We have no argument passed so just see if a page_template has been specified
-    if ( empty( $template ) ) {
-        if ( !empty( $page_template ) and ( 'default' != $page_template ) ) {
-            return true;
-        }
-    } elseif ( $template == $page_template) {
+
+    $page_template = get_page_template_slug( get_queried_object_id() );
+
+    if ( empty( $template ) )
+        return (bool) $page_template;
+
+    if ( $template == $page_template )
         return true;
-    }
+
+    if ( 'default' == $template && ! $page_template )
+        return true;
 
     return false;
+}
+
+/**
+ * Get the specific template name for a page.
+ *
+ * @since 3.4.0
+ *
+ * @param int $id The page ID to check. Defaults to the current post, when used in the loop.
+ * @return string|bool Page template filename. Returns an empty string when the default page template
+ *  is in use. Returns false if the post is not a page.
+ */
+function get_page_template_slug( $post_id = null ) {
+    $post = get_post( $post_id );
+    if ( 'page' != $post->post_type )
+        return false;
+    $template = get_post_meta( $post->ID, '_wp_page_template', true );
+    if ( ! $template || 'default' == $template )
+        return '';
+    return $template;
 }
 

trunk/wp-includes/post.php

@@ -5340 +5340 @@
     }
 }
-

trunk/wp-includes/template.php

@@ -226 +226 @@
 function get_page_template() {
     $id = get_queried_object_id();
-    $template = get_post_meta($id, '_wp_page_template', true);
+    $template = get_page_template_slug();
     $pagename = get_query_var('pagename');
 
-    if ( !$pagename && $id > 0 ) {
+    if ( ! $pagename && $id ) {
         // If a static page is set as the front page, $pagename will not be set. Retrieve it from the queried object
         $post = get_queried_object();
@@ -235 +235 @@
     }
 
-    if ( 'default' == $template )
-        $template = '';
-
-    $templates = array();
-    if ( !empty($template) && !validate_file($template) )
+    $templates = array();
+    if ( $template && 0 === validate_file( $template ) )
         $templates[] = $template;
     if ( $pagename )