Changeset 27881

Timestamp:

04/01/2014 02:57:52 AM (12 years ago)

Author:

nacin

Message:

Background Updates: Fix a PHP fatal error which could be encountered on some systems when using FTP.

Merges [26148] from 3.8 to the 3.7 branch.

props dd32.
fixes #25817.

Location:

branches/3.7

Files:

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

branches/3.7/src/wp-admin/includes/class-wp-upgrader.php

@@ -1334 +1334 @@
 
         $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());
@@ -1897 +1898 @@
             '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