More core update to update-core.php. Allow re-installing current version (requires api.wp.org changes)
git-svn-id: http://svn.automattic.com/wordpress/trunk@9543 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan
parent
63bc2ead19
commit
f597bae652
|
|
@ -94,12 +94,12 @@ function core_update_footer( $msg = '' ) {
|
|||
|
||||
switch ( $cur->response ) {
|
||||
case 'development' :
|
||||
return sprintf( __( 'You are using a development version (%1$s). Cool! Please <a href="%2$s">stay updated</a>.' ), $GLOBALS['wp_version'], 'update.php?action=upgrade-core');
|
||||
return sprintf( __( 'You are using a development version (%1$s). Cool! Please <a href="%2$s">stay updated</a>.' ), $GLOBALS['wp_version'], 'update-core.php');
|
||||
break;
|
||||
|
||||
case 'upgrade' :
|
||||
if ( current_user_can('manage_options') ) {
|
||||
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);
|
||||
return sprintf( '<strong>'.__( '<a href="%1$s">Get Version %2$s</a>' ).'</strong>', 'update-core.php', $cur->current);
|
||||
break;
|
||||
}
|
||||
|
||||
|
|
@ -118,7 +118,7 @@ function update_nag() {
|
|||
return false;
|
||||
|
||||
if ( current_user_can('manage_options') )
|
||||
$msg = sprintf( __('WordPress %1$s is available! <a href="%2$s">Please update now</a>.'), $cur->current, 'update.php?action=upgrade-core' );
|
||||
$msg = sprintf( __('WordPress %1$s is available! <a href="%2$s">Please update now</a>.'), $cur->current, 'update-core.php' );
|
||||
else
|
||||
$msg = sprintf( __('WordPress %1$s is available! Please notify the site administrator.'), $cur->current );
|
||||
|
||||
|
|
@ -132,7 +132,7 @@ function update_right_now_message() {
|
|||
|
||||
$msg = sprintf( __('You are using <span class="b">WordPress %s</span>.'), $GLOBALS['wp_version'] );
|
||||
if ( isset( $cur->response ) && $cur->response == 'upgrade' && current_user_can('manage_options') )
|
||||
$msg .= " <a href='update.php?action=upgrade-core' class='button'>" . sprintf( __('Update to %s'), $cur->current ? $cur->current : __( 'Latest' ) ) . '</a>';
|
||||
$msg .= " <a href='update-core.php' class='button'>" . sprintf( __('Update to %s'), $cur->current ? $cur->current : __( 'Latest' ) ) . '</a>';
|
||||
|
||||
echo "<span id='wp-version-message'>$msg</span>";
|
||||
}
|
||||
|
|
@ -479,7 +479,7 @@ function maintenance_nag() {
|
|||
return false;
|
||||
|
||||
if ( current_user_can('manage_options') )
|
||||
$msg = sprintf( __('An automated WordPress update has failed to complete - <a href="%s">please attempt the update again now</a>.'), 'update.php?action=upgrade-core' );
|
||||
$msg = sprintf( __('An automated WordPress update has failed to complete - <a href="%s">please attempt the update again now</a>.'), 'update-core.php' );
|
||||
else
|
||||
$msg = __('An automated WordPress update has failed to complete! Please notify the site administrator.');
|
||||
|
||||
|
|
|
|||
|
|
@ -91,7 +91,7 @@ $menu[45] = array( __('Tools'), 'manage_options', 'import.php', '', '', 'menu-to
|
|||
$submenu['import.php'][10] = array( __('Export'), 'import', 'export.php' );
|
||||
if ( ! $is_opera )
|
||||
$submenu['import.php'][20] = array( __('Turbo'), 'read', 'turbo.php' );
|
||||
$submenu['import.php'][30] = array( __('Update'), 'read', wp_nonce_url('update.php?action=upgrade-core', 'upgrade-core'));
|
||||
$submenu['import.php'][30] = array( __('Update'), 'read', 'update-core.php');
|
||||
|
||||
$menu[50] = array( __('Settings'), 'manage_options', 'options-general.php', '', 'menu-top-last', 'menu-settings', 'images/menu/settings.png' );
|
||||
$submenu['options-general.php'][10] = array(__('General'), 'manage_options', 'options-general.php');
|
||||
|
|
|
|||
|
|
@ -0,0 +1,215 @@
|
|||
<?php
|
||||
/**
|
||||
* Update Core administration panel.
|
||||
*
|
||||
* @package WordPress
|
||||
* @subpackage Administration
|
||||
*/
|
||||
|
||||
/** WordPress Administration Bootstrap */
|
||||
require_once('admin.php');
|
||||
|
||||
if ( ! current_user_can('update_plugins') )
|
||||
wp_die(__('You do not have sufficient permissions to update plugins for this blog.'));
|
||||
|
||||
function list_core_update( $update ) {
|
||||
$version_string = 'en_US' == $update->locale ?
|
||||
$update->current : sprintf("%s–<strong>%s</strong>", $update->current, $update->locale);
|
||||
$current = false;
|
||||
if ( !isset($update->response) || 'latest' == $update->response )
|
||||
$current = true;
|
||||
$submit = __('Upgrade Automatically');
|
||||
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:');
|
||||
$download = __('Download nightly build');
|
||||
} else {
|
||||
if ( $current ) {
|
||||
$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');
|
||||
} else {
|
||||
$message = sprintf(__('You can upgrade to version %s automatically or download the package and install it manually:'), $version_string);
|
||||
}
|
||||
$download = sprintf(__('Download %s'), $version_string);
|
||||
}
|
||||
|
||||
echo '<p>';
|
||||
echo $message;
|
||||
echo '</p>';
|
||||
echo '<form method="post" action="update-core.php?action=do-core-upgrade" name="upgrade" class="upgrade">';
|
||||
wp_nonce_field('upgrade-core');
|
||||
echo '<p>';
|
||||
echo '<input id="upgrade" class="button" type="submit" value="' . $submit . '" name="upgrade" /> ';
|
||||
echo '<input name="version" value="'.$update->current.'" type="hidden"/>';
|
||||
echo '<input name="locale" value="'.$update->locale.'" type="hidden"/>';
|
||||
echo '<a href="' . $update->package . '" class="button">' . $download . '</a> ';
|
||||
if ( 'en_US' != $update->locale )
|
||||
if ( !isset( $update->dismissed ) || !$update->dismissed )
|
||||
echo '<input id="dismiss" class="button" type="submit" value="' . attribute_escape(__('Hide this update')) . '" name="dismiss" />';
|
||||
else
|
||||
echo '<input id="undismiss" class="button" type="submit" value="' . attribute_escape(__('Bring back this update')) . '" name="undismiss" />';
|
||||
echo '</p>';
|
||||
echo '</form>';
|
||||
|
||||
}
|
||||
|
||||
function dismissed_updates() {
|
||||
$dismissed = get_core_updates( array( 'dismissed' => true, 'available' => false ) );
|
||||
if ( $dismissed ) {
|
||||
|
||||
$show_text = js_escape(__('Show hidden updates'));
|
||||
$hide_text = js_escape(__('Hide hidden updates'));
|
||||
?>
|
||||
<script type="text/javascript">
|
||||
|
||||
jQuery(function($) {
|
||||
$('dismissed-updates').show();
|
||||
$('#show-dismissed').toggle(function(){$(this).text('<?php echo $hide_text; ?>');}, function() {$(this).text('<?php echo $show_text; ?>')});
|
||||
$('#show-dismissed').click(function() { $('#dismissed-updates').toggle('slow');});
|
||||
});
|
||||
</script>
|
||||
<?php
|
||||
echo '<p class="hide-if-no-js"><a id="show-dismissed" href="#">'.__('Show hidden updates').'</a></p>';
|
||||
echo '<ul id="dismissed-updates" class="core-updates dismissed">';
|
||||
foreach($dismissed as $update) {
|
||||
echo '<li>';
|
||||
list_core_update( $update );
|
||||
echo '</li>';
|
||||
}
|
||||
echo '</ul>';
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Display upgrade WordPress for downloading latest or upgrading automatically form.
|
||||
*
|
||||
* @since 2.7
|
||||
*
|
||||
* @return null
|
||||
*/
|
||||
function core_upgrade_preamble() {
|
||||
$updates = get_core_updates();
|
||||
|
||||
echo '<div class="wrap">';
|
||||
echo '<h2>' . __('Upgrade WordPress') . '</h2>';
|
||||
|
||||
if ( !isset($updates[0]->response) || 'latest' == $updates[0]->response ) {
|
||||
echo '<h3>';
|
||||
_e('You have the latest version of WordPress. You do not need to upgrade');
|
||||
echo '</h3>';
|
||||
dismissed_updates();
|
||||
echo '</div>';
|
||||
} else {
|
||||
echo '<div class="updated fade"><p>';
|
||||
_e('<strong>Important:</strong> before upgrading, please <a href="http://codex.wordpress.org/WordPress_Backups">backup your database and files</a>.');
|
||||
echo '</p></div>';
|
||||
|
||||
echo '<h3 class="response">';
|
||||
_e( 'There is a new version of WordPress available for upgrade' );
|
||||
echo '</h3>';
|
||||
}
|
||||
|
||||
echo '<ul class="core-updates">';
|
||||
$alternate = true;
|
||||
foreach( $updates as $update ) {
|
||||
$class = $alternate? ' class="alternate"' : '';
|
||||
$alternate = !$alternate;
|
||||
echo "<li $class>";
|
||||
list_core_update( $update );
|
||||
echo '</li>';
|
||||
}
|
||||
echo '</ul>';
|
||||
dismissed_updates();
|
||||
echo '</div>';
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Upgrade WordPress core display.
|
||||
*
|
||||
* @since 2.7
|
||||
*
|
||||
* @return null
|
||||
*/
|
||||
function do_core_upgrade() {
|
||||
global $wp_filesystem;
|
||||
|
||||
$url = wp_nonce_url('update-core.php?action=do-core-upgrade', 'upgrade-core');
|
||||
if ( false === ($credentials = request_filesystem_credentials($url)) )
|
||||
return;
|
||||
|
||||
$version = isset( $_POST['version'] )? $_POST['version'] : false;
|
||||
$locale = isset( $_POST['locale'] )? $_POST['locale'] : 'en_US';
|
||||
$update = find_core_update( $version, $locale );
|
||||
if ( !$update )
|
||||
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($update, '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>';
|
||||
}
|
||||
|
||||
function do_dismiss_core_update() {
|
||||
$version = isset( $_POST['version'] )? $_POST['version'] : false;
|
||||
$locale = isset( $_POST['locale'] )? $_POST['locale'] : 'en_US';
|
||||
$update = find_core_update( $version, $locale );
|
||||
if ( !$update )
|
||||
return;
|
||||
dismiss_core_update( $update );
|
||||
wp_redirect( wp_nonce_url('update-core.php?action=upgrade-core', 'upgrade-core') );
|
||||
}
|
||||
|
||||
function do_undismiss_core_update() {
|
||||
$version = isset( $_POST['version'] )? $_POST['version'] : false;
|
||||
$locale = isset( $_POST['locale'] )? $_POST['locale'] : 'en_US';
|
||||
$update = find_core_update( $version, $locale );
|
||||
if ( !$update )
|
||||
return;
|
||||
undismiss_core_update( $version, $locale );
|
||||
wp_redirect( wp_nonce_url('update-core.php?action=upgrade-core', 'upgrade-core') );
|
||||
}
|
||||
|
||||
$action = isset($_GET['action']) ? $_GET['action'] : 'upgrade-core';
|
||||
|
||||
if ( 'upgrade-core' == $action ) {
|
||||
$title = __('Upgrade WordPress');
|
||||
$parent_file = 'index.php';
|
||||
require_once('admin-header.php');
|
||||
core_upgrade_preamble();
|
||||
include('admin-footer.php');
|
||||
} elseif ( 'do-core-upgrade' == $action ) {
|
||||
check_admin_referer('upgrade-core');
|
||||
$title = __('Upgrade WordPress');
|
||||
$parent_file = 'index.php';
|
||||
// do the (un)dismiss actions before headers,
|
||||
// so that they can redirect
|
||||
if ( isset( $_POST['dismiss'] ) )
|
||||
do_dismiss_core_update();
|
||||
elseif ( isset( $_POST['undismiss'] ) )
|
||||
do_undismiss_core_update();
|
||||
require_once('admin-header.php');
|
||||
if ( isset( $_POST['upgrade'] ) )
|
||||
do_core_upgrade();
|
||||
include('admin-footer.php');
|
||||
}?>
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
<?php
|
||||
/**
|
||||
* Update Plugin / Core administration panel.
|
||||
* Update Plugin/Theme administration panel.
|
||||
*
|
||||
* @package WordPress
|
||||
* @subpackage Administration
|
||||
|
|
@ -122,175 +122,6 @@ function do_theme_upgrade($theme) {
|
|||
echo '</div>';
|
||||
}
|
||||
|
||||
function list_core_update( $update ) {
|
||||
$version_string = 'en_US' == $update->locale?
|
||||
$update->current : sprintf("%s–<strong>%s</strong>", $update->current, $update->locale);
|
||||
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:');
|
||||
$submit = __('Download nightly build');
|
||||
} else {
|
||||
$message = sprintf(__('You can upgrade to version %s automatically or download the package and install it manually:'), $version_string);
|
||||
$submit = sprintf(__('Download %s'), $version_string);
|
||||
}
|
||||
|
||||
echo '<p>';
|
||||
echo $message;
|
||||
echo '</p>';
|
||||
echo '<form method="post" action="update.php?action=do-core-upgrade" name="upgrade" class="upgrade">';
|
||||
wp_nonce_field('upgrade-core');
|
||||
echo '<p>';
|
||||
echo '<input id="upgrade" class="button" type="submit" value="' . __('Upgrade Automatically') . '" name="upgrade" /> ';
|
||||
echo '<input name="version" value="'.$update->current.'" type="hidden"/>';
|
||||
echo '<input name="locale" value="'.$update->locale.'" type="hidden"/>';
|
||||
echo '<a href="' . $update->package . '" class="button">' . $submit . '</a> ';
|
||||
if ( 'en_US' != $update->locale )
|
||||
if ( !isset( $update->dismissed ) || !$update->dismissed )
|
||||
echo '<input id="dismiss" class="button" type="submit" value="' . attribute_escape(__('Hide this update')) . '" name="dismiss" />';
|
||||
else
|
||||
echo '<input id="undismiss" class="button" type="submit" value="' . attribute_escape(__('Bring back this update')) . '" name="undismiss" />';
|
||||
echo '</p>';
|
||||
echo '</form>';
|
||||
|
||||
}
|
||||
|
||||
function dismissed_updates() {
|
||||
$dismissed = get_core_updates( array( 'dismissed' => true, 'available' => false ) );
|
||||
if ( $dismissed ) {
|
||||
|
||||
$show_text = js_escape(__('Show hidden updates'));
|
||||
$hide_text = js_escape(__('Hide hidden updates'));
|
||||
?>
|
||||
<script type="text/javascript">
|
||||
|
||||
jQuery(function($) {
|
||||
$('dismissed-updates').show();
|
||||
$('#show-dismissed').toggle(function(){$(this).text('<?php echo $hide_text; ?>');}, function() {$(this).text('<?php echo $show_text; ?>')});
|
||||
$('#show-dismissed').click(function() { $('#dismissed-updates').toggle('slow');});
|
||||
});
|
||||
</script>
|
||||
<?php
|
||||
echo '<p class="hide-if-no-js"><a id="show-dismissed" href="#">'.__('Show hidden updates').'</a></p>';
|
||||
echo '<ul id="dismissed-updates" class="core-updates dismissed">';
|
||||
foreach($dismissed as $update) {
|
||||
echo '<li>';
|
||||
list_core_update( $update );
|
||||
echo '</li>';
|
||||
}
|
||||
echo '</ul>';
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Display upgrade WordPress for downloading latest or upgrading automatically form.
|
||||
*
|
||||
* @since 2.7
|
||||
*
|
||||
* @return null
|
||||
*/
|
||||
function core_upgrade_preamble() {
|
||||
$updates = get_core_updates();
|
||||
|
||||
echo '<div class="wrap">';
|
||||
echo '<h2>' . __('Upgrade WordPress') . '</h2>';
|
||||
|
||||
if ( !isset($updates[0]->response) || 'latest' == $updates[0]->response ) {
|
||||
echo '<h3>';
|
||||
_e('You have the latest version of WordPress. You do not need to upgrade');
|
||||
echo '</h3>';
|
||||
dismissed_updates();
|
||||
echo '</div>';
|
||||
return;
|
||||
}
|
||||
|
||||
echo '<div class="updated fade"><p>';
|
||||
_e('<strong>Important:</strong> before upgrading, please <a href="http://codex.wordpress.org/WordPress_Backups">backup your database and files</a>.');
|
||||
echo '</p></div>';
|
||||
|
||||
echo '<h3 class="response">';
|
||||
_e( 'There is a new version of WordPress available for upgrade' );
|
||||
echo '</h3>';
|
||||
echo '<ul class="core-updates">';
|
||||
$alternate = true;
|
||||
foreach( $updates as $update ) {
|
||||
$class = $alternate? ' class="alternate"' : '';
|
||||
$alternate = !$alternate;
|
||||
echo "<li $class>";
|
||||
list_core_update( $update );
|
||||
echo '</li>';
|
||||
}
|
||||
echo '</ul>';
|
||||
dismissed_updates();
|
||||
echo '</div>';
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Upgrade WordPress core display.
|
||||
*
|
||||
* @since 2.7
|
||||
*
|
||||
* @return null
|
||||
*/
|
||||
function do_core_upgrade() {
|
||||
global $wp_filesystem;
|
||||
|
||||
$url = wp_nonce_url('update.php?action=do-core-upgrade', 'upgrade-core');
|
||||
if ( false === ($credentials = request_filesystem_credentials($url)) )
|
||||
return;
|
||||
|
||||
$version = isset( $_POST['version'] )? $_POST['version'] : false;
|
||||
$locale = isset( $_POST['locale'] )? $_POST['locale'] : 'en_US';
|
||||
$update = find_core_update( $version, $locale );
|
||||
if ( !$update )
|
||||
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($update, '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>';
|
||||
}
|
||||
|
||||
function do_dismiss_core_update() {
|
||||
$version = isset( $_POST['version'] )? $_POST['version'] : false;
|
||||
$locale = isset( $_POST['locale'] )? $_POST['locale'] : 'en_US';
|
||||
$update = find_core_update( $version, $locale );
|
||||
if ( !$update )
|
||||
return;
|
||||
dismiss_core_update( $update );
|
||||
wp_redirect( wp_nonce_url('update.php?action=upgrade-core', 'upgrade-core') );
|
||||
}
|
||||
|
||||
function do_undismiss_core_update() {
|
||||
$version = isset( $_POST['version'] )? $_POST['version'] : false;
|
||||
$locale = isset( $_POST['locale'] )? $_POST['locale'] : 'en_US';
|
||||
$update = find_core_update( $version, $locale );
|
||||
if ( !$update )
|
||||
return;
|
||||
undismiss_core_update( $version, $locale );
|
||||
wp_redirect( wp_nonce_url('update.php?action=upgrade-core', 'upgrade-core') );
|
||||
}
|
||||
|
||||
if ( isset($_GET['action']) ) {
|
||||
$plugin = isset($_GET['plugin']) ? trim($_GET['plugin']) : '';
|
||||
$theme = isset($_REQUEST['theme']) ? urldecode($_REQUEST['theme']) : '';
|
||||
|
|
@ -322,26 +153,6 @@ if ( isset($_GET['action']) ) {
|
|||
include(WP_PLUGIN_DIR . '/' . $plugin);
|
||||
}
|
||||
iframe_footer();
|
||||
} elseif ( 'upgrade-core' == $action ) {
|
||||
$title = __('Upgrade WordPress');
|
||||
$parent_file = 'index.php';
|
||||
require_once('admin-header.php');
|
||||
core_upgrade_preamble();
|
||||
include('admin-footer.php');
|
||||
} elseif ( 'do-core-upgrade' == $action ) {
|
||||
check_admin_referer('upgrade-core');
|
||||
$title = __('Upgrade WordPress');
|
||||
$parent_file = 'index.php';
|
||||
// do the (un)dismiss actions before headers,
|
||||
// so that they can redirect
|
||||
if ( isset( $_POST['dismiss'] ) )
|
||||
do_dismiss_core_update();
|
||||
elseif ( isset( $_POST['undismiss'] ) )
|
||||
do_undismiss_core_update();
|
||||
require_once('admin-header.php');
|
||||
if ( isset( $_POST['upgrade'] ) )
|
||||
do_core_upgrade();
|
||||
include('admin-footer.php');
|
||||
} elseif ( 'upgrade-theme' == $action ) {
|
||||
check_admin_referer('upgrade-theme_' . $theme);
|
||||
$title = __('Upgrade Theme');
|
||||
|
|
|
|||
Loading…
Reference in New Issue