Changeset 20116

Timestamp:

03/05/2012 05:30:09 PM (11 years ago)

Author:

nacin

Message:

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.

File:

• trunk/wp-includes/theme.php (modified) (3 diffs)

trunk/wp-includes/theme.php

@@ -89 +89 @@
     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;
     }
@@ -493 +493 @@
         // 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 {
@@ -516 +516 @@
 
     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 ) )