From b53c9960687d90ae378f970e5642b6ec515efc5e Mon Sep 17 00:00:00 2001 From: nacin Date: Mon, 5 Mar 2012 17:30:09 +0000 Subject: [PATCH] Cast $wp_theme_directories to array. This had been done in get_themes(). A must-loaded plugin could call these functions before the first theme root is ever added. see #20103. git-svn-id: http://svn.automattic.com/wordpress/trunk@20116 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/theme.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/wp-includes/theme.php b/wp-includes/theme.php index c1b2220d6..e801eb792 100644 --- a/wp-includes/theme.php +++ b/wp-includes/theme.php @@ -88,7 +88,7 @@ function wp_get_theme( $stylesheet = null, $theme_root = null ) { if ( empty( $theme_root ) ) { $theme_root = get_raw_theme_root( $stylesheet ); - if ( ! in_array( $theme_root, $wp_theme_directories ) ) + if ( ! in_array( $theme_root, (array) $wp_theme_directories ) ) $theme_root = WP_CONTENT_DIR . $theme_root; } @@ -492,7 +492,7 @@ function get_theme_root( $stylesheet_or_template = false ) { if ( $stylesheet_or_template && $theme_root = get_raw_theme_root( $stylesheet_or_template ) ) { // Always prepend WP_CONTENT_DIR unless the root currently registered as a theme directory. // This gives relative theme roots the benefit of the doubt when things go haywire. - if ( ! in_array( $theme_root, $wp_theme_directories ) ) + if ( ! in_array( $theme_root, (array) $wp_theme_directories ) ) $theme_root = WP_CONTENT_DIR . $theme_root; } else { $theme_root = WP_CONTENT_DIR . '/themes'; @@ -515,7 +515,7 @@ function get_theme_root_uri( $stylesheet_or_template = false ) { global $wp_theme_directories; if ( $stylesheet_or_template && $theme_root = get_raw_theme_root( $stylesheet_or_template ) ) { - if ( in_array( $theme_root, $wp_theme_directories ) ) { + if ( in_array( $theme_root, (array) $wp_theme_directories ) ) { // Absolute path. Make an educated guess. YMMV -- but note the filter below. if ( 0 === strpos( $theme_root, WP_CONTENT_DIR ) ) $theme_root_uri = content_url( str_replace( WP_CONTENT_DIR, '', $theme_root ) );