Ticket #5560: 5560.diff

wp-admin/includes/file.php

@@ -408 +408 @@
                                 return new WP_Error('copy_failed', __('Could not copy file'), $to . $filename);
                         $wp_filesystem->chmod($to . $filename, 0644);
                 } elseif ( 'd' == $fileinfo['type'] ) {
-                        if ( !$wp_filesystem->mkdir($to . $filename, 0755) )
-                                return new WP_Error('mkdir_failed', __('Could not create directory'), $to . $filename);
+                        if ( !$wp_filesystem->is_dir($to . $filename) ) {
+                                if ( !$wp_filesystem->mkdir($to . $filename, 0755) )
+                                        return new WP_Error('mkdir_failed', __('Could not create directory'), $to . $filename);
+                        }
                         $result = copy_dir($from . $filename, $to . $filename);
                         if ( is_wp_error($result) )
                                 return $result;

wp-admin/includes/update.php

@@ -15 +15 @@
 
         case 'upgrade' :
                 if ( current_user_can('manage_options') ) {
-                        return sprintf( '| <strong>'.__( '<a href="%2$s">Get Version %3$s</a>' ).'</strong>', $GLOBALS['wp_version'], $cur->url, $cur->current );
+                        return sprintf( '| <strong>'.__( '<a href="%1$s">Get Version %2$s</a>' ).'</strong>', wp_nonce_url('update.php?action=upgrade-core', 'upgrade-core'), $cur->current);
                         break;
                 }
 
@@ -188 +188 @@
         return  $folder . '/' . $pluginfiles[0];
 }
 
+function wp_update_core($feedback = '') {
+        global $wp_filesystem;
+
+        if ( !empty($feedback) )
+                add_filter('update_feedback', $feedback);
+
+        // Is an update available?
+        $current = get_option( 'update_core' );
+        //if ( !isset( $current->response ) || $current->response != 'upgrade' )
+        //      return new WP_Error('up_to_date', __('WordPress is at the latest version.'));
+
+        // Is a filesystem accessor setup?
+        if ( ! $wp_filesystem || ! is_object($wp_filesystem) )
+                WP_Filesystem();
+
+        if ( ! is_object($wp_filesystem) )
+                return new WP_Error('fs_unavailable', __('Could not access filesystem.'));
+
+        if ( $wp_filesystem->errors->get_error_code() )
+                return new WP_Error('fs_error', __('Filesystem error'), $wp_filesystem->errors);
+
+        // Get the base WP folder
+        $wp_dir = $wp_filesystem->abspath();
+        if ( empty($wp_dir) )
+                return new WP_Error('fs_no_wp_dir', __('Unable to locate WordPress directory.'));
+
+        // And the same for the Content directory.
+        $content_dir = $wp_filesystem->wp_content_dir();
+        if( empty($content_dir) )
+                return new WP_Error('fs_no_content_dir', __('Unable to locate WordPress Content directory (wp-content).'));
+        
+        $wp_dir = trailingslashit( $wp_dir );
+        $content_dir = trailingslashit( $content_dir );
+
+        // Get the URL to the zip file
+        //$pacakge = "http://wordpress.org/wordpress-{$current->current}.zip";
+        $package = "http://wordpress.org/wordpress-2.6.zip";
+
+        // Download the package
+        apply_filters('update_feedback', sprintf(__('Downloading update from %s'), $package));
+        $download_file = download_url($package);
+
+        if ( is_wp_error($download_file) )
+                return new WP_Error('download_failed', __('Download failed.'), $download_file->get_error_message());
+
+        $working_dir = $content_dir . 'upgrade/core';
+
+        // Clean up working directory
+        if ( $wp_filesystem->is_dir($working_dir) )
+                $wp_filesystem->delete($working_dir, true);
+
+        apply_filters('update_feedback', __('Unpacking the update'));
+        // Unzip package to working directory
+        $result = unzip_file($download_file, $working_dir);
+
+        // Once extracted, delete the package
+        unlink($download_file);
+        
+        if ( is_wp_error($result) ) {
+                $wp_filesystem->delete($working_dir, true);
+                return $result;
+        }
+
+        apply_filters('update_feedback', __('Installing the latest version'));
+        // Copy new versions of WP files into place.
+        $result = copy_dir($working_dir . '/wordpress', $wp_dir);
+        if ( is_wp_error($result) ) {
+                //$wp_filesystem->delete($working_dir, true); //TODO: Uncomment? This DOES mean that the new files are available in the upgrade folder if it fails.
+                return $result;
+        }
+
+        // Might have to do upgrade in a separate step.
+        apply_filters('update_feedback', __('Upgrading database'));
+        // Get new db version
+        global $wp_db_version;
+        require (ABSPATH . WPINC . '/version.php');
+        // Upgrade db
+        define('WP_INSTALLING', true);
+        require_once(ABSPATH . 'wp-admin/includes/upgrade.php');
+        wp_upgrade();
+
+        // Remove working directory
+        $wp_filesystem->delete($working_dir, true);
+
+        // Force refresh of update information
+        delete_option('update_core');
+}
+
 ?>

wp-admin/update.php

@@ -44 +44 @@
         echo '</div>';
 }
 
+function do_core_upgrade() {
+        global $wp_filesystem;
+
+        $url = wp_nonce_url("update.php?action=upgrade-core", "upgrade-core");
+        if ( false === ($credentials = request_filesystem_credentials($url)) )
+                return;
+
+        if ( ! WP_Filesystem($credentials) ) {
+                request_filesystem_credentials($url, '', true); //Failed to connect, Error and request again
+                return;
+        }
+
+        echo '<div class="wrap">';
+        echo '<h2>' . __('Upgrade WordPress') . '</h2>';
+        if ( $wp_filesystem->errors->get_error_code() ) {
+                foreach ( $wp_filesystem->errors->get_error_messages() as $message )
+                        show_message($message);
+                echo '</div>';
+                return;
+        }
+
+        $result = wp_update_core('show_message');
+
+        if ( is_wp_error($result) ) {
+                show_message($result);
+                if ('up_to_date' != $result->get_error_code() )
+                        show_message( __('Installation Failed') );
+        } else {
+                show_message( __('WordPress upgraded successfully') );  
+        }
+        echo '</div>';
+}
+
 if ( isset($_GET['action']) ) {
         $plugin = isset($_GET['plugin']) ? trim($_GET['plugin']) : '';
 
@@ -84 +117 @@
                         include(WP_PLUGIN_DIR . '/' . $plugin);
                 }
                 echo "</body></html>";
+        } elseif ( 'upgrade-core' == $_GET['action'] ) {
+                //check_admin_referer('upgrade-core');
+                $title = __('Upgrade WordPress');
+                $parent_file = 'index.php';
+                require_once('admin-header.php');
+                do_core_upgrade();
+                include('admin-footer.php');
         }
 }