<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[15996] trunk: Add 'Check Again' button and timestamp to update-core.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15996">15996</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-10-27 02:21:49 +0000 (Wed, 27 Oct 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add 'Check Again' button and timestamp to update-core. Also return the same error message for themes as we do for plugins when no checkboxes are checked. fixes <a href="http://trac.wordpress.org/ticket/14764">#14764</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminupdatecorephp">trunk/wp-admin/update-core.php</a></li>
<li><a href="#trunkwpcontentpluginshellophp">trunk/wp-content/plugins/hello.php</a></li>
<li><a href="#trunkwpcontentthemestwentytenstylecss">trunk/wp-content/themes/twentyten/style.css</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminupdatecorephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/update-core.php (15995 => 15996)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/update-core.php 2010-10-27 01:58:17 UTC (rev 15995)
+++ trunk/wp-admin/update-core.php 2010-10-27 02:21:49 UTC (rev 15996)
</span><span class="lines">@@ -121,16 +121,25 @@
</span><span class="cx"> <?php
</span><span class="cx"> if ( $upgrade_error ) {
</span><span class="cx"> echo '<div class="error"><p>';
</span><del>- _e('Please select one or more plugins to upgrade.');
</del><ins>+ if ( $upgrade_error == 'themes' )
+ _e('Please select one or more themes to update.');
+ else
+ _e('Please select one or more plugins to update.');
</ins><span class="cx"> echo '</p></div>';
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ echo '<p>';
+ /* 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 ' &nbsp; <a class="button" href="' . esc_url( self_admin_url('update-core.php') ) . '">' . __( 'Check Again' ) . '</a>';
+ echo '</p>';
+
</ins><span class="cx"> if ( !isset($updates[0]->response) || 'latest' == $updates[0]->response ) {
</span><span class="cx"> echo '<h3>';
</span><span class="cx"> _e('You have the latest version of WordPress.');
</span><span class="cx"> echo '</h3>';
</span><span class="cx"> } else {
</span><del>- echo '<div class="updated"><p>';
</del><ins>+ echo '<div class="updated inline"><p>';
</ins><span class="cx"> _e('<strong>Important:</strong> before updating, please <a href="http://codex.wordpress.org/WordPress_Backups">back up your database and files</a>. For help with updates, visit the <a href="http://codex.wordpress.org/Updating_WordPress">Updating WordPress</a> Codex page.');
</span><span class="cx"> echo '</p></div>';
</span><span class="cx">
</span><span class="lines">@@ -373,8 +382,9 @@
</span><span class="cx"> $action = isset($_GET['action']) ? $_GET['action'] : 'upgrade-core';
</span><span class="cx">
</span><span class="cx"> $upgrade_error = false;
</span><del>-if ( 'do-plugin-upgrade' == $action && !isset($_GET['plugins']) && !isset($_POST['checked']) ) {
- $upgrade_error = true;
</del><ins>+if ( ( 'do-theme-upgrade' == $action || ( 'do-plugin-upgrade' == $action && ! isset( $_GET['plugins'] ) ) )
+ && ! isset( $_POST['checked'] ) ) {
+ $upgrade_error = $action == 'do-theme-upgrade' ? 'themes' : 'plugins';
</ins><span class="cx"> $action = 'upgrade-core';
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpcontentpluginshellophp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/plugins/hello.php (15995 => 15996)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/plugins/hello.php 2010-10-27 01:58:17 UTC (rev 15995)
+++ trunk/wp-content/plugins/hello.php 2010-10-27 02:21:49 UTC (rev 15996)
</span><span class="lines">@@ -8,7 +8,7 @@
</span><span class="cx"> Plugin URI: http://wordpress.org/#
</span><span class="cx"> 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 <cite>Hello, Dolly</cite> in the upper right of your admin screen on every page.
</span><span class="cx"> Author: Matt Mullenweg
</span><del>-Version: 1.5.1
</del><ins>+Version: 1.4
</ins><span class="cx"> Author URI: http://ma.tt/
</span><span class="cx"> */
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpcontentthemestwentytenstylecss"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentyten/style.css (15995 => 15996)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentyten/style.css 2010-10-27 01:58:17 UTC (rev 15995)
+++ trunk/wp-content/themes/twentyten/style.css 2010-10-27 02:21:49 UTC (rev 15996)
</span><span class="lines">@@ -3,7 +3,7 @@
</span><span class="cx"> Theme URI: http://wordpress.org/
</span><span class="cx"> 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.
</span><span class="cx"> Author: the WordPress team
</span><del>-Version: 1.1
</del><ins>+Version: 1.0.1
</ins><span class="cx"> 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
</span><span class="cx"> */
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>