WordPress 4.1.3

[autoinstalls/wordpress.git] / wp-admin / update-core.php

diff --git a/wp-admin/update-core.php b/wp-admin/update-core.php
index 7c939e71f0ccb2209cf15737bd91f8235e034661..600db23eee9a197c63585b968545c6bae7833c0b 100644 (file)
--- a/wp-admin/update-core.php
+++ b/wp-admin/update-core.php
@@ -242,7 +242,7 @@ function list_plugin_updates() {
        foreach ( (array) $plugins as $plugin_file => $plugin_data) {
                $info = plugins_api('plugin_information', array('slug' => $plugin_data->update->slug ));
                if ( is_wp_error( $info ) ) {
        foreach ( (array) $plugins as $plugin_file => $plugin_data) {
                $info = plugins_api('plugin_information', array('slug' => $plugin_data->update->slug ));
                if ( is_wp_error( $info ) ) {

-                       continue;
+                       $info = false;

                }
 
                // Get plugin compat for running version of WordPress.
                }
 
                // Get plugin compat for running version of WordPress.


@@ -390,14 +390,14 @@ function do_core_upgrade( $reinstall = false ) {
        <h2><?php _e('Update WordPress'); ?></h2>
 <?php
 
        <h2><?php _e('Update WordPress'); ?></h2>
 <?php
 

-       if ( false === ( $credentials = request_filesystem_credentials( $url, '', false, ABSPATH, array(), $allow_relaxed_file_ownership ) ) ) {
+       if ( false === ( $credentials = request_filesystem_credentials( $url, '', false, ABSPATH, array( 'version', 'locale' ), $allow_relaxed_file_ownership ) ) ) {

                echo '</div>';
                return;
        }
 
        if ( ! WP_Filesystem( $credentials, ABSPATH, $allow_relaxed_file_ownership ) ) {
                // Failed to connect, Error and request again
                echo '</div>';
                return;
        }
 
        if ( ! WP_Filesystem( $credentials, ABSPATH, $allow_relaxed_file_ownership ) ) {
                // Failed to connect, Error and request again

-               request_filesystem_credentials( $url, '', true, ABSPATH, array(), $allow_relaxed_file_ownership );
+               request_filesystem_credentials( $url, '', true, ABSPATH, array( 'version', 'locale' ), $allow_relaxed_file_ownership );

                echo '</div>';
                return;
        }
                echo '</div>';
                return;
        }