Bootstrap/Load: Revert [55890].

danielbachhuber · danielbachhuber · commit 3fb4889b1fff · 2023-06-07T20:27:17.000Z
As it turns out, WP-CLI *also* doesn't `define( 'WP_USE_THEMES', true );`, which means an active theme's `functions.php` isn't loaded by default and causes a backwards compatibility break. See #57928. git-svn-id: https://develop.svn.wordpress.org/trunk@55891 602fd350-edb4-49c9-b593-d223f7449a82
diff --git a/src/wp-includes/load.php b/src/wp-includes/load.php
@@ -948,10 +948,6 @@ function wp_get_active_and_valid_themes() {
 		return $themes;
 	}
 
-	if ( ! wp_using_themes() ) {
-		return $themes;
-	}
-
 	if ( TEMPLATEPATH !== STYLESHEETPATH ) {
 		$themes[] = STYLESHEETPATH;
 	}
diff --git a/tests/phpunit/includes/bootstrap.php b/tests/phpunit/includes/bootstrap.php
@@ -252,7 +252,6 @@
 if ( ! defined( 'WP_DEFAULT_THEME' ) ) {
 	define( 'WP_DEFAULT_THEME', 'default' );
 }
-define( 'WP_USE_THEMES', true );
 $wp_theme_directories = array();
 
 if ( file_exists( DIR_TESTDATA . '/themedir1' ) ) {
diff --git a/tests/phpunit/tests/load/wpGetActiveAndValidThemes.php b/tests/phpunit/tests/load/wpGetActiveAndValidThemes.php

Original file line number	Diff line number	Diff line change
`@@ -948,10 +948,6 @@ function wp_get_active_and_valid_themes() {`
`948`	`948`	`return $themes;`
`949`	`949`	`}`
`950`	`950`
`951`		`- if ( ! wp_using_themes() ) {`
`952`		`- return $themes;`
`953`		`- }`
`954`		`-`
`955`	`951`	`if ( TEMPLATEPATH !== STYLESHEETPATH ) {`
`956`	`952`	`$themes[] = STYLESHEETPATH;`
`957`	`953`	`}`
Original file line number	Diff line number	Diff line change
`@@ -252,7 +252,6 @@`
`252`	`252`	`if ( ! defined( 'WP_DEFAULT_THEME' ) ) {`
`253`	`253`	`define( 'WP_DEFAULT_THEME', 'default' );`
`254`	`254`	`}`
`255`		`-define( 'WP_USE_THEMES', true );`
`256`	`255`	`$wp_theme_directories = array();`
`257`	`256`
`258`	`257`	`if ( file_exists( DIR_TESTDATA . '/themedir1' ) ) {`