diff --git a/wp-admin/update-core.php b/wp-admin/update-core.php index 6b3ef87f8..dd96f2582 100644 --- a/wp-admin/update-core.php +++ b/wp-admin/update-core.php @@ -121,16 +121,25 @@ function core_upgrade_preamble() {

'; - _e('Please select one or more plugins to upgrade.'); + if ( $upgrade_error == 'themes' ) + _e('Please select one or more themes to update.'); + else + _e('Please select one or more plugins to update.'); echo '

'; } + echo '

'; + /* translators: %1 date, %2 time. */ + printf( __('Last checked on %1$s at %2$s.'), date_i18n( get_option( 'date_format' ) ), date_i18n( get_option( 'time_format' ) ) ); + echo '   ' . __( 'Check Again' ) . ''; + echo '

'; + if ( !isset($updates[0]->response) || 'latest' == $updates[0]->response ) { echo '

'; _e('You have the latest version of WordPress.'); echo '

'; } else { - echo '

'; + echo '

'; _e('Important: before updating, please back up your database and files. For help with updates, visit the Updating WordPress Codex page.'); echo '

'; @@ -373,8 +382,9 @@ function no_update_actions($actions) { $action = isset($_GET['action']) ? $_GET['action'] : 'upgrade-core'; $upgrade_error = false; -if ( 'do-plugin-upgrade' == $action && !isset($_GET['plugins']) && !isset($_POST['checked']) ) { - $upgrade_error = true; +if ( ( 'do-theme-upgrade' == $action || ( 'do-plugin-upgrade' == $action && ! isset( $_GET['plugins'] ) ) ) + && ! isset( $_POST['checked'] ) ) { + $upgrade_error = $action == 'do-theme-upgrade' ? 'themes' : 'plugins'; $action = 'upgrade-core'; } diff --git a/wp-content/plugins/hello.php b/wp-content/plugins/hello.php index 2877f0834..2d8fe51f6 100644 --- a/wp-content/plugins/hello.php +++ b/wp-content/plugins/hello.php @@ -8,7 +8,7 @@ Plugin Name: Hello Dolly Plugin URI: http://wordpress.org/# Description: This is not just a plugin, it symbolizes the hope and enthusiasm of an entire generation summed up in two words sung most famously by Louis Armstrong: Hello, Dolly. When activated you will randomly see a lyric from Hello, Dolly in the upper right of your admin screen on every page. Author: Matt Mullenweg -Version: 1.5.1 +Version: 1.4 Author URI: http://ma.tt/ */ diff --git a/wp-content/themes/twentyten/style.css b/wp-content/themes/twentyten/style.css index 0e80fb943..e1c65d07c 100644 --- a/wp-content/themes/twentyten/style.css +++ b/wp-content/themes/twentyten/style.css @@ -3,7 +3,7 @@ Theme Name: Twenty Ten Theme URI: http://wordpress.org/ Description: The 2010 theme for WordPress is stylish, customizable, simple, and readable -- make it yours with a custom menu, header image, and background. Twenty Ten supports six widgetized areas (two in the sidebar, four in the footer) and featured images (thumbnails for gallery posts and custom header images for posts and pages). It includes stylesheets for print and the admin Visual Editor, special styles for posts in the "Asides" and "Gallery" categories, and has an optional one-column page template that removes the sidebar. Author: the WordPress team -Version: 1.1 +Version: 1.0.1 Tags: black, blue, white, two-columns, fixed-width, custom-header, custom-background, threaded-comments, sticky-post, translation-ready, microformats, rtl-language-support, editor-style, custom-menu */