<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[12135] trunk/wp-includes/theme.php: Improve get_page_template()
to search based on slug and id as well.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12135">12135</a></dd>
<dt>Author</dt> <dd>westi</dd>
<dt>Date</dt> <dd>2009-11-01 10:18:34 +0000 (Sun, 01 Nov 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Improve get_page_template() to search based on slug and id as well. Fixes <a href="http://trac.wordpress.org/ticket/11055">#11055</a> props aaroncampbell.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesthemephp">trunk/wp-includes/theme.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesthemephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/theme.php (12134 => 12135)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/theme.php 2009-11-01 10:10:06 UTC (rev 12134)
+++ trunk/wp-includes/theme.php 2009-11-01 10:18:34 UTC (rev 12135)
</span><span class="lines">@@ -827,9 +827,9 @@
</span><span class="cx"> /**
</span><span class="cx"> * Retrieve path of page template in current or parent template.
</span><span class="cx"> *
</span><del>- * First attempt is to look for the file in the '_wp_page_template' page meta
- * data. The second attempt, if the first has a file and is not empty, is to
- * look for 'page.php'.
</del><ins>+ * Will first look for the specifically assigned page template
+ * The will search for 'page-{slug}.php' followed by 'page-id.php'
+ * and finally 'page.php'
</ins><span class="cx"> *
</span><span class="cx"> * @since 1.5.0
</span><span class="cx"> *
</span><span class="lines">@@ -840,6 +840,7 @@
</span><span class="cx">
</span><span class="cx"> $id = (int) $wp_query->post->ID;
</span><span class="cx"> $template = get_post_meta($id, '_wp_page_template', true);
</span><ins>+ $pagename = get_query_var('pagename');
</ins><span class="cx">
</span><span class="cx"> if ( 'default' == $template )
</span><span class="cx"> $template = '';
</span><span class="lines">@@ -847,7 +848,10 @@
</span><span class="cx"> $templates = array();
</span><span class="cx"> if ( !empty($template) && !validate_file($template) )
</span><span class="cx"> $templates[] = $template;
</span><del>-
</del><ins>+ if ( $pagename )
+ $templates[] = "page-$pagename.php";
+ if ( $id )
+ $templates[] = "page-$id.php";
</ins><span class="cx"> $templates[] = "page.php";
</span><span class="cx">
</span><span class="cx"> return apply_filters('page_template', locate_template($templates));
</span></span></pre>
</div>
</div>
</body>
</html>