Changeset 41174 for trunk/src/wp-includes/theme.php

Timestamp:

07/27/2017 04:59:36 PM (9 years ago)

Author:

johnbillion

Message:

General: Avoid counting uncountable values when reading theme directories, and in some unit tests.

See #40109

File:

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

trunk/src/wp-includes/theme.php

@@ -36 +36 @@
         $theme_directories = search_theme_directories();
 
-        if ( count( $wp_theme_directories ) > 1 ) {
+        if ( is_array( $wp_theme_directories ) && count( $wp_theme_directories ) > 1 ) {
                 // Make sure the current theme wins out, in case search_theme_directories() picks the wrong
                 // one in the case of a conflict. (Normally, last registered theme root wins.)
@@ -628 +628 @@
         global $wp_theme_directories;
 
-        if ( count($wp_theme_directories) <= 1 )
+        if ( ! is_array( $wp_theme_directories ) || count( $wp_theme_directories ) <= 1 ) {
                 return '/themes';
+        }
 
         $theme_root = false;