WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

See #40109

Built from https://develop.svn.wordpress.org/trunk@41174


git-svn-id: http://core.svn.wordpress.org/trunk@41014 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
John Blackbourn 2017-07-27 17:00:44 +00:00
parent 96183d09bd
commit 219de8acd5
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
wp-includes/theme.php
View File

@ -35,7 +35,7 @@ function wp_get_themes( $args = array() ) {
$theme_directories = search_theme_directories(); $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 // 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.) // one in the case of a conflict. (Normally, last registered theme root wins.)
$current_theme = get_stylesheet(); $current_theme = get_stylesheet();
@ -627,8 +627,9 @@ function get_theme_root_uri( $stylesheet_or_template = false, $theme_root = fals
function get_raw_theme_root( $stylesheet_or_template, $skip_cache = false ) { function get_raw_theme_root( $stylesheet_or_template, $skip_cache = false ) {
global $wp_theme_directories; global $wp_theme_directories;
if ( count($wp_theme_directories) <= 1 ) if ( ! is_array( $wp_theme_directories ) || count( $wp_theme_directories ) <= 1 ) {
return '/themes'; return '/themes';
}
$theme_root = false; $theme_root = false;

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.9-alpha-41173'; $wp_version = '4.9-alpha-41174';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.