<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[20075] trunk/wp-includes: Introduce get_page_template_slug( $id = null ) to return a page's template (like "showcase.php").</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/20075">20075</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2012-03-02 18:56:54 +0000 (Fri, 02 Mar 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>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 <a href="http://core.trac.wordpress.org/ticket/18750">#18750</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesclasswpxmlrpcserverphp">trunk/wp-includes/class-wp-xmlrpc-server.php</a></li>
<li><a href="#trunkwpincludesposttemplatephp">trunk/wp-includes/post-template.php</a></li>
<li><a href="#trunkwpincludespostphp">trunk/wp-includes/post.php</a></li>
<li><a href="#trunkwpincludestemplatephp">trunk/wp-includes/template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesclasswpxmlrpcserverphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class-wp-xmlrpc-server.php (20074 => 20075)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-wp-xmlrpc-server.php 2012-03-02 18:06:30 UTC (rev 20074)
+++ trunk/wp-includes/class-wp-xmlrpc-server.php 2012-03-02 18:56:54 UTC (rev 20075)
</span><span class="lines">@@ -1177,7 +1177,7 @@
</span><span class="cx"> // Get the author info.
</span><span class="cx"> $author = get_userdata($page->post_author);
</span><span class="cx">
</span><del>- $page_template = get_post_meta( $page->ID, '_wp_page_template', true );
</del><ins>+ $page_template = get_page_template_slug( $page->ID );
</ins><span class="cx"> if ( empty( $page_template ) )
</span><span class="cx"> $page_template = 'default';
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludesposttemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/post-template.php (20074 => 20075)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/post-template.php 2012-03-02 18:06:30 UTC (rev 20074)
+++ trunk/wp-includes/post-template.php 2012-03-02 18:56:54 UTC (rev 20075)
</span><span class="lines">@@ -487,7 +487,7 @@
</span><span class="cx"> }
</span><span class="cx"> if ( is_page_template() ) {
</span><span class="cx"> $classes[] = 'page-template';
</span><del>- $classes[] = 'page-template-' . sanitize_html_class( str_replace( '.', '-', get_post_meta( $page_id, '_wp_page_template', true ) ), '' );
</del><ins>+ $classes[] = 'page-template-' . sanitize_html_class( str_replace( '.', '-', get_page_template_slug( $page_id ) ) );
</ins><span class="cx"> } else {
</span><span class="cx"> $classes[] = 'page-template-default';
</span><span class="cx"> }
</span><span class="lines">@@ -1241,30 +1241,44 @@
</span><span class="cx"> * @param string $template The specific template name if specific matching is required.
</span><span class="cx"> * @return bool False on failure, true if success.
</span><span class="cx"> */
</span><del>-function is_page_template($template = '') {
- if (!is_page()) {
</del><ins>+function is_page_template( $template = '' ) {
+ if ( ! is_page() )
</ins><span class="cx"> return false;
</span><del>- }
</del><span class="cx">
</span><del>- global $wp_query;
</del><ins>+ $page_template = get_page_template_slug( get_queried_object_id() );
</ins><span class="cx">
</span><del>- $page = $wp_query->get_queried_object();
- $custom_fields = get_post_custom_values('_wp_page_template',$page->ID);
- $page_template = $custom_fields[0];
</del><ins>+ if ( empty( $template ) )
+ return (bool) $page_template;
</ins><span class="cx">
</span><del>- // 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) {
</del><ins>+ if ( $template == $page_template )
</ins><span class="cx"> return true;
</span><del>- }
</del><span class="cx">
</span><ins>+ if ( 'default' == $template && ! $page_template )
+ return true;
+
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * 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;
+}
+
+/**
</ins><span class="cx"> * Retrieve formatted date timestamp of a revision (linked to that revisions's page).
</span><span class="cx"> *
</span><span class="cx"> * @package WordPress
</span></span></pre></div>
<a id="trunkwpincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/post.php (20074 => 20075)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/post.php 2012-03-02 18:06:30 UTC (rev 20074)
+++ trunk/wp-includes/post.php 2012-03-02 18:56:54 UTC (rev 20075)
</span><span class="lines">@@ -5338,5 +5338,4 @@
</span><span class="cx">
</span><span class="cx"> update_post_caches( $fresh_posts, 'any', $update_term_cache, $update_meta_cache );
</span><span class="cx"> }
</span><del>-}
-
</del><ins>+}
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpincludestemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/template.php (20074 => 20075)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/template.php 2012-03-02 18:06:30 UTC (rev 20074)
+++ trunk/wp-includes/template.php 2012-03-02 18:56:54 UTC (rev 20075)
</span><span class="lines">@@ -225,20 +225,17 @@
</span><span class="cx"> */
</span><span class="cx"> function get_page_template() {
</span><span class="cx"> $id = get_queried_object_id();
</span><del>- $template = get_post_meta($id, '_wp_page_template', true);
</del><ins>+ $template = get_page_template_slug();
</ins><span class="cx"> $pagename = get_query_var('pagename');
</span><span class="cx">
</span><del>- if ( !$pagename && $id > 0 ) {
</del><ins>+ if ( ! $pagename && $id ) {
</ins><span class="cx"> // If a static page is set as the front page, $pagename will not be set. Retrieve it from the queried object
</span><span class="cx"> $post = get_queried_object();
</span><span class="cx"> $pagename = $post->post_name;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( 'default' == $template )
- $template = '';
-
</del><span class="cx"> $templates = array();
</span><del>- if ( !empty($template) && !validate_file($template) )
</del><ins>+ if ( $template && 0 === validate_file( $template ) )
</ins><span class="cx"> $templates[] = $template;
</span><span class="cx"> if ( $pagename )
</span><span class="cx"> $templates[] = "page-$pagename.php";
</span></span></pre>
</div>
</div>
</body>
</html>