Changeset 8597

Timestamp:

08/09/08 03:20:16 (4 months ago)

Author:

ryan

Message:

Landing page for auto upgrade. see #5560

Files:

• trunk/wp-admin/includes/update.php (modified) (3 diffs)
• trunk/wp-admin/update.php (modified) (2 diffs)

trunk/wp-admin/includes/update.php

@@ -16 +16 @@
-    switch ( $cur->response ) {
-    case 'development' :
-wp_nonce_url('update.php?action=upgrade-core', 'upgrade-core')
+'update.php?action=upgrade-core'
-    break;
-
@@ -40 +40 @@
-
-    if ( current_user_can('manage_options') )
-wp_nonce_url('update.php?action=upgrade-core', 'upgrade-core')
+'update.php?action=upgrade-core'
-    else
-        $msg = sprintf( __('WordPress %1$s is available! Please notify the site administrator.'), $cur->current );
@@ -54 +54 @@
-    $msg = sprintf( __('This is WordPress version %s.'), $GLOBALS['wp_version'] );
-    if ( isset( $cur->response ) && $cur->response == 'upgrade' && current_user_can('manage_options') )
-" . wp_nonce_url('update.php?action=upgrade-core', 'upgrade-core') . "
+update.php?action=upgrade-core
-
-    echo "<span id='wp-version-message'>$msg</span>";

trunk/wp-admin/update.php

@@ -42 +42 @@
-        }
-    }
+    echo '</div>';
+}
+
+function core_upgrade_preamble() {
+    $update = get_option('update_core');
+
+    echo '<div class="wrap">';
+    echo '<h2>' . __('Upgrade WordPress') . '</h2>';
+
+    if ( !isset($update->response) || 'latest' == $update->response ) {
+        _e('You have the latest version of WordPress. You do not need to upgrade.');
+        echo '</div>';
+        return;
+    }
+
+    if ( 'development' == $update->response ) {
+        $message = __('You are using a developmemt version of WordPress.  You can upgrade to the latest nightly build automatically or download the nightly build and install it manually. Which would you like to do?');
+        $submit = __('Download nightly build');
+    } else {
+        $message =  sprintf(__('You can upgrade to version %s automatically or download the nightly build and install it manually. Which would you like to do?'), $update->current);
+        $submit = sprintf(__('Download %s'), $update->current);
+    }
+
+    echo '<p>';
+    echo $message;
+    echo '</p>';
+    echo '<form id="post" method="post" action="update.php?action=do-core-upgrade" name="upgrade">';
+    wp_nonce_field('upgrade-core');
+    echo '<p>';
+    echo '<input id="upgrade" class="button" type="submit" value="' . __('Upgrade Automatically') . '" name="upgrade" />';
+    echo '<a href="' . $update->package . '" class="button">' . $submit . '</a>';
+    echo '</p>';
+    echo '</form>';
+
-    echo '</div>';
-}
@@ -119 +153 @@
-        echo "</body></html>";
-    } elseif ( 'upgrade-core' == $_GET['action'] ) {
-
+
+
+
+
+
+
+
-        $title = __('Upgrade WordPress');
-        $parent_file = 'index.php';