Include file.php separately from class-wp-upgrader.php (#5539)

johnwatkins0 · westonruter · commit 76377614e5bd · 2020-10-26T10:52:57.000-07:00
diff --git a/src/Admin/ReaderThemes.php b/src/Admin/ReaderThemes.php
@@ -384,8 +384,11 @@ public function can_install_theme( $theme ) {
 		}
 
 		if ( null === $this->can_install_themes ) {
-			if ( ! class_exists( 'WP_Upgrader' ) ) {
+			if ( ! function_exists( 'request_filesystem_credentials' ) ) {
 				require_once ABSPATH . 'wp-admin/includes/file.php';
+			}
+
+			if ( ! class_exists( 'WP_Upgrader' ) ) {
 				require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
 			}
 

Original file line number	Diff line number	Diff line change
`@@ -384,8 +384,11 @@ public function can_install_theme( $theme ) {`
`384`	`384`	`}`
`385`	`385`
`386`	`386`	`if ( null === $this->can_install_themes ) {`
`387`		`- if ( ! class_exists( 'WP_Upgrader' ) ) {`
	`387`	`+ if ( ! function_exists( 'request_filesystem_credentials' ) ) {`
`388`	`388`	`require_once ABSPATH . 'wp-admin/includes/file.php';`
	`389`	`+ }`
	`390`	`+`
	`391`	`+ if ( ! class_exists( 'WP_Upgrader' ) ) {`
`389`	`392`	`require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';`
`390`	`393`	`}`
`391`	`394`