Escape the backslash in function_exists for WP_Filesystem to actually…

… check for it in the global namespace.
Automattic · Oct 28, 2019 · cf2b048 · cf2b048
1 parent e089413
commit cf2b048
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/bin/phpcs-whitelist.js b/bin/phpcs-whitelist.js
@@ -15,8 +15,8 @@ module.exports = [
 	'_inc/lib/core-api/wpcom-endpoints/memberships.php',
 	'_inc/lib/debugger/',
 	'_inc/lib/plans.php',
-	'json-endpoints/jetpack/class.jetpack-json-api-delete-backup-helper-script.php',
-	'json-endpoints/jetpack/class.jetpack-json-api-install-backup-helper-script.php',
+	'json-endpoints/jetpack/class-jetpack-json-api-delete-backup-helper-script.php',
+	'json-endpoints/jetpack/class-jetpack-json-api-install-backup-helper-script.php',
 	'load-jetpack.php',
 	'modules/masterbar/',
 	'modules/memberships/',

diff --git a/packages/backup/src/Helper_Script_Manager.php b/packages/backup/src/Helper_Script_Manager.php
@@ -274,7 +274,7 @@ private static function write_supplementary_temp_files( $dir ) {
 	private static function put_contents( $file_path, $contents ) {
 		global $wp_filesystem;
 
-		if ( ! function_exists( '\WP_Filesystem' ) ) {
+		if ( ! function_exists( '\\WP_Filesystem' ) ) {
 			require_once ABSPATH . 'wp-admin/includes/file.php';
 		}
 
@@ -298,7 +298,7 @@ private static function put_contents( $file_path, $contents ) {
 	private static function verify_file_header( $file_path, $expected_header ) {
 		global $wp_filesystem;
 
-		if ( ! function_exists( '\WP_Filesystem' ) ) {
+		if ( ! function_exists( '\\WP_Filesystem' ) ) {
 			require_once ABSPATH . 'wp-admin/includes/file.php';
 		}