Changeset 26148

Timestamp:

11/14/2013 02:01:30 AM (11 years ago)

Author:

dd32

Message:

Background Updates: Fix a PHP Fatal error which could be encountered on some systems when using FTP. Fixes #25817 for trunk.

File:

• trunk/src/wp-admin/includes/class-wp-upgrader.php (modified) (2 diffs)

trunk/src/wp-admin/includes/class-wp-upgrader.php

@@ -1335 +1335 @@
 
         $res = $this->fs_connect( array(ABSPATH, WP_CONTENT_DIR) );
-        if ( is_wp_error($res) )
+        if ( ! $res || is_wp_error( $res ) ) {
             return $res;
+        }
 
         $wp_dir = trailingslashit($wp_filesystem->abspath());
@@ -1899 +1900 @@
             'attempt_rollback'   => true, /* only available for core updates */
         ) );
+
+        // if the filesystem is unavailable, false is returned.
+        if ( false === $upgrade_result ) {
+            $upgrade_result = new WP_Error( 'fs_unavailable', __( 'Could not access filesystem.' ) );           
+        }
 
         // Core doesn't output this, so lets append it so we don't get confused