From f0d8d094e2b605271810332185fb911bf5e3c825 Mon Sep 17 00:00:00 2001
From: scribu <scribu@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Sun, 10 Oct 2010 22:10:36 +0000
Subject: [PATCH] Allow string as first parameter to locate_template(). Props
 chrisbliss18 for initial patch. Fixes #15061

git-svn-id: http://svn.automattic.com/wordpress/trunk@15771 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/general-template.php | 2 +-
 wp-includes/theme.php            | 7 ++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/wp-includes/general-template.php b/wp-includes/general-template.php
index 3962bc97f..1ffd71beb 100644
--- a/wp-includes/general-template.php
+++ b/wp-includes/general-template.php
@@ -151,7 +151,7 @@ function get_template_part( $slug, $name = null ) {
 function get_search_form($echo = true) {
 	do_action( 'get_search_form' );
 
-	$search_form_template = locate_template(array('searchform.php'));
+	$search_form_template = locate_template('searchform.php');
 	if ( '' != $search_form_template ) {
 		require($search_form_template);
 		return;
diff --git a/wp-includes/theme.php b/wp-includes/theme.php
index 3d6780692..1a5a17ddc 100644
--- a/wp-includes/theme.php
+++ b/wp-includes/theme.php
@@ -1075,17 +1075,14 @@ function get_comments_popup_template() {
  *
  * @since 2.7.0
  *
- * @param array $template_names Array of template files to search for in priority order.
+ * @param string|array $template_names Template file(s) to search for, in order.
  * @param bool $load If true the template file will be loaded if it is found.
  * @param bool $require_once Whether to require_once or require. Default true. Has no effect if $load is false.
  * @return string The template filename if one is located.
  */
 function locate_template($template_names, $load = false, $require_once = true ) {
-	if ( !is_array($template_names) )
-		return '';
-
 	$located = '';
-	foreach ( $template_names as $template_name ) {
+	foreach ( (array) $template_names as $template_name ) {
 		if ( !$template_name )
 			continue;
 		if ( file_exists(STYLESHEETPATH . '/' . $template_name)) {