<!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>[15771] trunk/wp-includes:
Allow string as first parameter to locate_template().</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15771">15771</a></dd>
<dt>Author</dt> <dd>scribu</dd>
<dt>Date</dt> <dd>2010-10-10 22:10:36 +0000 (Sun, 10 Oct 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Allow string as first parameter to locate_template(). Props chrisbliss18 for initial patch. Fixes <a href="http://trac.wordpress.org/ticket/15061">#15061</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesgeneraltemplatephp">trunk/wp-includes/general-template.php</a></li>
<li><a href="#trunkwpincludesthemephp">trunk/wp-includes/theme.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesgeneraltemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/general-template.php (15770 => 15771)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/general-template.php 2010-10-10 20:02:26 UTC (rev 15770)
+++ trunk/wp-includes/general-template.php 2010-10-10 22:10:36 UTC (rev 15771)
</span><span class="lines">@@ -151,7 +151,7 @@
</span><span class="cx"> function get_search_form($echo = true) {
</span><span class="cx"> do_action( 'get_search_form' );
</span><span class="cx">
</span><del>- $search_form_template = locate_template(array('searchform.php'));
</del><ins>+ $search_form_template = locate_template('searchform.php');
</ins><span class="cx"> if ( '' != $search_form_template ) {
</span><span class="cx"> require($search_form_template);
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkwpincludesthemephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/theme.php (15770 => 15771)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/theme.php 2010-10-10 20:02:26 UTC (rev 15770)
+++ trunk/wp-includes/theme.php 2010-10-10 22:10:36 UTC (rev 15771)
</span><span class="lines">@@ -1075,17 +1075,14 @@
</span><span class="cx"> *
</span><span class="cx"> * @since 2.7.0
</span><span class="cx"> *
</span><del>- * @param array $template_names Array of template files to search for in priority order.
</del><ins>+ * @param string|array $template_names Template file(s) to search for, in order.
</ins><span class="cx"> * @param bool $load If true the template file will be loaded if it is found.
</span><span class="cx"> * @param bool $require_once Whether to require_once or require. Default true. Has no effect if $load is false.
</span><span class="cx"> * @return string The template filename if one is located.
</span><span class="cx"> */
</span><span class="cx"> function locate_template($template_names, $load = false, $require_once = true ) {
</span><del>- if ( !is_array($template_names) )
- return '';
-
</del><span class="cx"> $located = '';
</span><del>- foreach ( $template_names as $template_name ) {
</del><ins>+ foreach ( (array) $template_names as $template_name ) {
</ins><span class="cx"> if ( !$template_name )
</span><span class="cx"> continue;
</span><span class="cx"> if ( file_exists(STYLESHEETPATH . '/' . $template_name)) {
</span></span></pre>
</div>
</div>
</body>
</html>