Changeset 10166

Timestamp:

12/10/2008 07:59:05 AM (18 years ago)

Author:

ryan

Message:

Fix reinstall

File:

• trunk/wp-admin/update-core.php (modified) (7 diffs)

trunk/wp-admin/update-core.php

@@ -20 +20 @@
                 $current = true;
         $submit = __('Upgrade Automatically');
+        $form_action = 'update-core.php?action=do-core-upgrade';
         if ( 'development' == $update->response ) {
                 $message = __('You are using a development version of WordPress.  You can upgrade to the latest nightly build automatically or download the nightly build and install it manually:');
@@ -27 +28 @@
                         $message = sprintf(__('You have the latest version of WordPress. You do not need to upgrade. However, if you want to re-install version %s, you can do so automatically or download the package and re-install manually:'), $version_string);
                         $submit = __('Re-install Automatically');
+                        $form_action = 'update-core.php?action=do-core-reinstall';
                 } else {
                         $message =      sprintf(__('You can upgrade to version %s automatically or download the package and install it manually:'), $version_string);
@@ -36 +38 @@
         echo $message;
         echo '</p>';
-        echo '<form method="post" action="update-core.php?action=do-core-upgrade" name="upgrade" class="upgrade">';
+        echo '<form method="post" action="' . $form_action . '" name="upgrade" class="upgrade">';
         wp_nonce_field('upgrade-core');
         echo '<p>';
@@ -130 +132 @@
  * @return null
  */
-function do_core_upgrade() {
+function do_core_upgrade( $reinstall = false ) {
         global $wp_filesystem;
 
@@ -160 +162 @@
         }
 
+        if ( $reinstall )
+                $update->response = 'reinstall';
+
         $result = wp_update_core($update, 'show_message');
 
@@ -200 +205 @@
         core_upgrade_preamble();
         include('admin-footer.php');
-} elseif ( 'do-core-upgrade' == $action ) {
+} elseif ( 'do-core-upgrade' == $action || 'do-core-reinstall' == $action ) {
         check_admin_referer('upgrade-core');
         $title = __('Upgrade WordPress');
@@ -211 +216 @@
         do_undismiss_core_update();
         require_once('admin-header.php');
+        if ( 'do-core-reinstall' == $action )
+                $reinstall = true;
+        else
+                $reinstall = false;
         if ( isset( $_POST['upgrade'] ) )
-                do_core_upgrade();
+                do_core_upgrade($reinstall);
         include('admin-footer.php');
+
 }?>