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. git-svn-id: https://develop.svn.wordpress.org/branches/3.7@27881 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
parent
75f1989c76
commit
8bdd3fd056
@ -1333,8 +1333,9 @@ class Core_Upgrader extends WP_Upgrader {
|
||||
return new WP_Error('up_to_date', $this->strings['up_to_date']);
|
||||
|
||||
$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,6 +1898,11 @@ class WP_Automatic_Updater {
|
||||
'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
|
||||
if ( 'core' == $type ) {
|
||||
if ( is_wp_error( $upgrade_result ) ) {
|
||||
|
Loading…
x
Reference in New Issue
Block a user