diff --git a/wp-includes/general-template.php b/wp-includes/general-template.php
index 3962bc9..1ffd71b 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 3d67806..ef86c80 100644
--- a/wp-includes/theme.php
+++ b/wp-includes/theme.php
@@ -1075,13 +1075,15 @@ 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 to search for, or an array thereof in priority 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) )
+	if ( is_string($template_names) )
+		$template_names = array($template_names);
+	else if ( !is_array($template_names) )
 		return '';
 
 	$located = '';