<!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>[13146] trunk: Introduce new get_generic_template()
function for themes to use to bring in pieces of template.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13146">13146</a></dd>
<dt>Author</dt> <dd>westi</dd>
<dt>Date</dt> <dd>2010-02-14 09:32:23 +0000 (Sun, 14 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Introduce new get_generic_template() function for themes to use to bring in pieces of template.
Use in twentyten for loop.php including. See <a href="http://trac.wordpress.org/ticket/9015">#9015</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpcontentthemestwentytenarchivephp">trunk/wp-content/themes/twentyten/archive.php</a></li>
<li><a href="#trunkwpcontentthemestwentytenauthorphp">trunk/wp-content/themes/twentyten/author.php</a></li>
<li><a href="#trunkwpcontentthemestwentytencategoryphp">trunk/wp-content/themes/twentyten/category.php</a></li>
<li><a href="#trunkwpcontentthemestwentytenindexphp">trunk/wp-content/themes/twentyten/index.php</a></li>
<li><a href="#trunkwpcontentthemestwentytensearchphp">trunk/wp-content/themes/twentyten/search.php</a></li>
<li><a href="#trunkwpcontentthemestwentytentagphp">trunk/wp-content/themes/twentyten/tag.php</a></li>
<li><a href="#trunkwpincludesgeneraltemplatephp">trunk/wp-includes/general-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpcontentthemestwentytenarchivephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/archive.php (13145 => 13146)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/archive.php 2010-02-14 08:21:07 UTC (rev 13145)
+++ trunk/wp-content/themes/twentyten/archive.php 2010-02-14 09:32:23 UTC (rev 13146)
</span><span class="lines">@@ -17,7 +17,7 @@
</span><span class="cx">
</span><span class="cx"> <?php rewind_posts(); ?>
</span><span class="cx">
</span><del>-<?php include 'loop.php'; ?>
</del><ins>+<?php get_generic_template( 'loop', 'archive' ); ?>
</ins><span class="cx">
</span><span class="cx"> </div><!-- #content -->
</span><span class="cx"> </div><!-- #container -->
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytenauthorphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/author.php (13145 => 13146)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/author.php 2010-02-14 08:21:07 UTC (rev 13145)
+++ trunk/wp-content/themes/twentyten/author.php 2010-02-14 09:32:23 UTC (rev 13146)
</span><span class="lines">@@ -21,7 +21,7 @@
</span><span class="cx">
</span><span class="cx"> <?php rewind_posts(); ?>
</span><span class="cx">
</span><del>-<?php include 'loop.php'; ?>
</del><ins>+<?php get_generic_template( 'loop', 'author' ); ?>
</ins><span class="cx">
</span><span class="cx"> </div><!-- #content -->
</span><span class="cx"> </div><!-- #container -->
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytencategoryphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/category.php (13145 => 13146)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/category.php 2010-02-14 08:21:07 UTC (rev 13145)
+++ trunk/wp-content/themes/twentyten/category.php 2010-02-14 09:32:23 UTC (rev 13146)
</span><span class="lines">@@ -10,7 +10,7 @@
</span><span class="cx">
</span><span class="cx"> <?php rewind_posts(); ?>
</span><span class="cx">
</span><del>-<?php include 'loop.php'; ?>
</del><ins>+<?php get_generic_template( 'loop', 'category' ); ?>
</ins><span class="cx">
</span><span class="cx"> </div><!-- #content -->
</span><span class="cx"> </div><!-- #container -->
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytenindexphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/index.php (13145 => 13146)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/index.php 2010-02-14 08:21:07 UTC (rev 13145)
+++ trunk/wp-content/themes/twentyten/index.php 2010-02-14 09:32:23 UTC (rev 13146)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> <div id="content">
</span><span class="cx">
</span><span class="cx"> <?php if ( have_posts() ) :
</span><del>- include 'loop.php';
</del><ins>+ get_generic_template( 'loop', 'index' );
</ins><span class="cx"> else : ?>
</span><span class="cx"> <h2><?php _e( 'Not Found', 'twentyten' ); ?></h2>
</span><span class="cx"> <div class="entry-content">
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytensearchphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/search.php (13145 => 13146)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/search.php 2010-02-14 08:21:07 UTC (rev 13145)
+++ trunk/wp-content/themes/twentyten/search.php 2010-02-14 09:32:23 UTC (rev 13146)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx">
</span><span class="cx"> <?php if ( have_posts() ) : ?>
</span><span class="cx"> <h1 class="page-title"><?php _e( 'Search Results for: ', 'twentyten' ); ?><span><?php the_search_query(); ?></span></h1>
</span><del>- <?php include 'loop.php'; ?>
</del><ins>+ <?php get_generic_template( 'loop', 'search' ); ?>
</ins><span class="cx"> <?php else : ?>
</span><span class="cx"> <div id="post-0" class="post no-results not-found">
</span><span class="cx"> <h2 class="entry-title"><?php _e( 'Nothing Found', 'twentyten' ); ?></h2>
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytentagphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/tag.php (13145 => 13146)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/tag.php 2010-02-14 08:21:07 UTC (rev 13145)
+++ trunk/wp-content/themes/twentyten/tag.php 2010-02-14 09:32:23 UTC (rev 13146)
</span><span class="lines">@@ -9,7 +9,7 @@
</span><span class="cx">
</span><span class="cx"> <?php rewind_posts(); ?>
</span><span class="cx">
</span><del>-<?php include 'loop.php'; ?>
</del><ins>+<?php get_generic_template( 'loop', 'tag' ); ?>
</ins><span class="cx">
</span><span class="cx"> </div><!-- #content -->
</span><span class="cx"> </div><!-- #container -->
</span></span></pre></div>
<a id="trunkwpincludesgeneraltemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/general-template.php (13145 => 13146)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/general-template.php 2010-02-14 08:21:07 UTC (rev 13145)
+++ trunk/wp-includes/general-template.php 2010-02-14 09:32:23 UTC (rev 13146)
</span><span class="lines">@@ -94,6 +94,35 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * Load a generic template.
+ *
+ * Includes the named template for a theme or if a name is specified then a
+ * specialised template will be included. If the theme contains no {slug}.php file
+ * then no template will be included.
+ *
+ * For the parameter, if the file is called "{slug}-special.php" then specify
+ * "special".
+ *
+ * @uses locate_template()
+ * @since 3.0.0
+ * @uses do_action() Calls 'get_generic_template_{$slug}' action.
+ *
+ * @param string $slug The slug name for the generic template.
+ * @param string $name The name of the specialised template.
+ */
+function get_generic_template( $slug, $name = null ) {
+ do_action( "get_generic_template_{$slug}", $name );
+
+ $templates = array();
+ if ( isset($name) )
+ $templates[] = "{$slug}-{$name}.php";
+
+ $templates[] = "{$slug}.php";
+
+ locate_template($templates, true);
+}
+
+/**
</ins><span class="cx"> * Display search form.
</span><span class="cx"> *
</span><span class="cx"> * Will first attempt to locate the searchform.php file in either the child or
</span></span></pre>
</div>
</div>
</body>
</html>