Changeset 56342

Timestamp:

08/01/2023 04:08:16 PM (15 months ago)

Author:

SergeyBiryukov

Message:

Upgrade/Install: Pass stored credentials to WP_Filesystem() where appropriate.

With the introduction of temporary backups of plugins and themes before updating, a new Site Health test was added to verify that plugin and theme temporary backup directories are writable or can be created.

When using a non-direct filesystem, the Site Health test did not include the required credentials, leading to a fatal error as the connection was not initialized properly.

This commit attemps to use the stored credentials if available, and displays a message otherwise.

Includes a similar fix in a function that performs a cleanup of the temporary backup directory.

Follow-up to [55720].

Props utsav72640, rajinsharwar, costdev, mukesh27, peterwilsoncc, audrasjb, SergeyBiryukov.
Reviewed by audrasjb, SergeyBiryukov.
Merges [56341] to the 6.3 branch.
See #58940.

Location:

branches/6.3

Files:

• . (modified) (1 prop)
• src/wp-admin/includes/class-wp-site-health.php (modified) (1 diff)
• src/wp-includes/update.php (modified) (1 diff)

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

@@ -2010 +2010 @@
         );
 
-        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']      = 'recommended';
+            $result['label']       = __( 'Could not access filesystem' );
+            $result['description'] = __( 'Unable to connect to the filesystem. Please confirm your credentials.' );
+            return $result;
         }
 

branches/6.3/src/wp-includes/update.php

@@ -1114 +1114 @@
     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.' ) );
     }