Ticket #58940: 58940.diff

src/wp-admin/includes/class-wp-site-health.php

@@ -2009 +2009 @@
                         'test'        => 'update_temp_backup_writable',
                 );
 
-                if ( ! $wp_filesystem ) {
+                if ( ! function_exists( 'WP_Filesystem' ) ) {
                         require_once ABSPATH . '/wp-admin/includes/file.php';
-                        WP_Filesystem();
                 }
 
+                ob_start();
+                $credentials = request_filesystem_credentials( '' );
+                ob_end_clean();
+
+                if ( false === $credentials || ! WP_Filesystem( $credentials ) ) {
+                        $result['status']      = 'critical';
+                        $result['label']       = __( 'Could not access filesystem' );
+                        $result['description'] = __( 'Unable to connect to the filesystem. Please confirm your credentials.' );
+                        return $result;
+                }
+
                 $wp_content = $wp_filesystem->wp_content_dir();
 
                 if ( ! $wp_content ) {

src/wp-includes/update.php

@@ -1113 +1113 @@
 function _wp_delete_all_temp_backups() {
         global $wp_filesystem;
 
-        if ( ! $wp_filesystem ) {
+        if ( ! function_exists( 'WP_Filesystem' ) ) {
                 require_once ABSPATH . '/wp-admin/includes/file.php';
-                WP_Filesystem();
         }
 
+        ob_start();
+        $credentials = request_filesystem_credentials( '' );
+        ob_end_clean();
+
+        if ( false === $credentials || ! WP_Filesystem( $credentials ) ) {
+                return new WP_Error( 'fs_unavailable', __( 'Could not access filesystem.' ) );
+        }
+
         if ( ! $wp_filesystem->wp_content_dir() ) {
                 return new WP_Error(
                         'fs_no_content_dir',