<!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>[13590] trunk/wp-admin: UI upgrade -> update, see #12517</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13590">13590</a></dd>
<dt>Author</dt> <dd>wpmuguru</dd>
<dt>Date</dt> <dd>2010-03-04 23:28:15 +0000 (Thu, 04 Mar 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>UI upgrade -> update, see <a href="http://trac.wordpress.org/ticket/12517">#12517</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesmsphp">trunk/wp-admin/includes/ms.php</a></li>
<li><a href="#trunkwpadminmenuphp">trunk/wp-admin/menu.php</a></li>
<li><a href="#trunkwpadminmsupgradenetworkphp">trunk/wp-admin/ms-upgrade-network.php</a></li>
<li><a href="#trunkwpadminupdatecorephp">trunk/wp-admin/update-core.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesmsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/ms.php (13589 => 13590)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/ms.php 2010-03-04 23:11:51 UTC (rev 13589)
+++ trunk/wp-admin/includes/ms.php 2010-03-04 23:28:15 UTC (rev 13590)
</span><span class="lines">@@ -666,7 +666,7 @@
</span><span class="cx"> if ( !is_super_admin() )
</span><span class="cx"> return false;
</span><span class="cx"> if ( get_site_option( 'wpmu_upgrade_site' ) != $wp_db_version )
</span><del>- echo "<div id='update-nag'>" . __( 'Thank you for Upgrading! Please visit the <a href="ms-upgrade-network.php">Upgrade Network</a> page to update all your sites.' ) . "</div>";
</del><ins>+ echo "<div id='update-nag'>" . __( 'Thank you for Updating! Please visit the <a href="ms-upgrade-network.php">Update Network</a> page to update all your sites.' ) . "</div>";
</ins><span class="cx"> }
</span><span class="cx"> add_action( 'admin_notices', 'site_admin_notice' );
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminmenuphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/menu.php (13589 => 13590)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/menu.php 2010-03-04 23:11:51 UTC (rev 13589)
+++ trunk/wp-admin/menu.php 2010-03-04 23:28:15 UTC (rev 13590)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx"> $submenu[ 'ms-admin.php' ][10] = array( __('Users'), 'manage_network_users', 'ms-users.php' );
</span><span class="cx"> $submenu[ 'ms-admin.php' ][20] = array( __('Themes'), 'manage_network_themes', 'ms-themes.php' );
</span><span class="cx"> $submenu[ 'ms-admin.php' ][25] = array( __('Options'), 'manage_network_options', 'ms-options.php' );
</span><del>- $submenu[ 'ms-admin.php' ][30] = array( __('Upgrade'), 'manage_network', 'ms-upgrade-network.php' );
</del><ins>+ $submenu[ 'ms-admin.php' ][30] = array( __('Update'), 'manage_network', 'ms-upgrade-network.php' );
</ins><span class="cx">
</span><span class="cx"> $menu[1] = array( '', 'read', 'separator1', '', 'wp-menu-separator' );
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminmsupgradenetworkphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/ms-upgrade-network.php (13589 => 13590)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/ms-upgrade-network.php 2010-03-04 23:11:51 UTC (rev 13589)
+++ trunk/wp-admin/ms-upgrade-network.php 2010-03-04 23:28:15 UTC (rev 13590)
</span><span class="lines">@@ -6,7 +6,7 @@
</span><span class="cx">
</span><span class="cx"> require_once( ABSPATH . WPINC . '/http.php' );
</span><span class="cx">
</span><del>-$title = __('Upgrade Network');
</del><ins>+$title = __('Update Network');
</ins><span class="cx"> $parent_file = 'ms-admin.php';
</span><span class="cx"> require_once('admin-header.php');
</span><span class="cx">
</span><span class="lines">@@ -15,7 +15,7 @@
</span><span class="cx">
</span><span class="cx"> echo '<div class="wrap">';
</span><span class="cx"> screen_icon();
</span><del>-echo '<h2>'.__('Upgrade Network').'</h2>';
</del><ins>+echo '<h2>'.__('Update Network').'</h2>';
</ins><span class="cx">
</span><span class="cx"> $action = isset($_GET['action']) ? $_GET['action'] : 'show';
</span><span class="cx">
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx"> echo "<li>$siteurl</li>";
</span><span class="cx"> $response = wp_remote_get( trailingslashit( $siteurl ) . "wp-admin/upgrade.php?step=1", array( 'timeout' => 120, 'httpversion' => '1.1' ) );
</span><span class="cx"> if ( is_wp_error( $response ) )
</span><del>- wp_die( "<strong>Warning!</strong> Problem upgrading {$siteurl}. Your server may not be able to connect to blogs running on it.<br /> Error message: <em>" . $response->get_error_message() ."</em>" );
</del><ins>+ wp_die( "<strong>Warning!</strong> Problem updating {$siteurl}. Your server may not be able to connect to sites running on it.<br /> Error message: <em>" . $response->get_error_message() ."</em>" );
</ins><span class="cx"> do_action( 'after_mu_upgrade', $response );
</span><span class="cx"> do_action( 'wpmu_upgrade_site', $details[ 'blog_id' ] );
</span><span class="cx"> }
</span><span class="lines">@@ -58,8 +58,8 @@
</span><span class="cx"> break;
</span><span class="cx"> case 'show':
</span><span class="cx"> default:
</span><del>- ?><p><?php _e("You can upgrade all the sites on your network through this page. It works by calling the upgrade script of each site automatically. Hit the link below to upgrade."); ?></p>
- <p><a class="button" href="ms-upgrade-network.php?action=upgrade"><?php _e("Upgrade Network"); ?></a></p><?php
</del><ins>+ ?><p><?php _e("You can update all the sites on your network through this page. It works by calling the update script of each site automatically. Hit the link below to update."); ?></p>
+ <p><a class="button" href="ms-upgrade-network.php?action=upgrade"><?php _e("Update Network"); ?></a></p><?php
</ins><span class="cx"> do_action( 'wpmu_upgrade_page' );
</span><span class="cx"> break;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpadminupdatecorephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/update-core.php (13589 => 13590)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/update-core.php 2010-03-04 23:11:51 UTC (rev 13589)
+++ trunk/wp-admin/update-core.php 2010-03-04 23:28:15 UTC (rev 13590)
</span><span class="lines">@@ -19,30 +19,30 @@
</span><span class="cx"> $current = false;
</span><span class="cx"> if ( !isset($update->response) || 'latest' == $update->response )
</span><span class="cx"> $current = true;
</span><del>- $submit = __('Upgrade Automatically');
</del><ins>+ $submit = __('Update Automatically');
</ins><span class="cx"> $form_action = 'update-core.php?action=do-core-upgrade';
</span><span class="cx"> $php_version = phpversion();
</span><span class="cx"> $mysql_version = $wpdb->db_version();
</span><span class="cx"> $show_buttons = true;
</span><span class="cx"> if ( 'development' == $update->response ) {
</span><del>- $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:');
</del><ins>+ $message = __('You are using a development version of WordPress. You can update to the latest nightly build automatically or download the nightly build and install it manually:');
</ins><span class="cx"> $download = __('Download nightly build');
</span><span class="cx"> } else {
</span><span class="cx"> if ( $current ) {
</span><del>- $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);
</del><ins>+ $message = sprintf(__('You have the latest version of WordPress. You do not need to update. However, if you want to re-install version %s, you can do so automatically or download the package and re-install manually:'), $version_string);
</ins><span class="cx"> $submit = __('Re-install Automatically');
</span><span class="cx"> $form_action = 'update-core.php?action=do-core-reinstall';
</span><span class="cx"> } else {
</span><span class="cx"> $php_compat = version_compare( $php_version, $update->php_version, '>=' );
</span><span class="cx"> $mysql_compat = version_compare( $mysql_version, $update->mysql_version, '>=' ) || file_exists( WP_CONTENT_DIR . '/db.php' );
</span><span class="cx"> if ( !$mysql_compat && !$php_compat )
</span><del>- $message = sprintf( __('You cannot upgrade because <a href="http://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> requires PHP version %2$s or higher and MySQL version %3$s or higher. You are running PHP version %4$s and MySQL version %5$s.'), $update->current, $update->php_version, $update->mysql_version, $php_version, $mysql_version );
</del><ins>+ $message = sprintf( __('You cannot update because <a href="http://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> requires PHP version %2$s or higher and MySQL version %3$s or higher. You are running PHP version %4$s and MySQL version %5$s.'), $update->current, $update->php_version, $update->mysql_version, $php_version, $mysql_version );
</ins><span class="cx"> elseif ( !$php_compat )
</span><del>- $message = sprintf( __('You cannot upgrade because <a href="http://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> requires PHP version %2$s or higher. You are running version %3$s.'), $update->current, $update->php_version, $php_version );
</del><ins>+ $message = sprintf( __('You cannot update because <a href="http://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> requires PHP version %2$s or higher. You are running version %3$s.'), $update->current, $update->php_version, $php_version );
</ins><span class="cx"> elseif ( !$mysql_compat )
</span><del>- $message = sprintf( __('You cannot upgrade because <a href="http://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> requires MySQL version %2$s or higher. You are running version %3$s.'), $update->current, $update->mysql_version, $mysql_version );
</del><ins>+ $message = sprintf( __('You cannot update because <a href="http://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> requires MySQL version %2$s or higher. You are running version %3$s.'), $update->current, $update->mysql_version, $mysql_version );
</ins><span class="cx"> else
</span><del>- $message = sprintf(__('You can upgrade to <a href="http://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> automatically or download the package and install it manually:'), $version_string);
</del><ins>+ $message = sprintf(__('You can update to <a href="http://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> automatically or download the package and install it manually:'), $version_string);
</ins><span class="cx"> if ( !$mysql_compat || !$php_compat )
</span><span class="cx"> $show_buttons = false;
</span><span class="cx"> }
</span><span class="lines">@@ -127,15 +127,15 @@
</span><span class="cx">
</span><span class="cx"> if ( !isset($updates[0]->response) || 'latest' == $updates[0]->response ) {
</span><span class="cx"> echo '<h3>';
</span><del>- _e('You have the latest version of WordPress. You do not need to upgrade');
</del><ins>+ _e('You have the latest version of WordPress. You do not need to update');
</ins><span class="cx"> echo '</h3>';
</span><span class="cx"> } else {
</span><span class="cx"> echo '<div class="updated"><p>';
</span><del>- _e('<strong>Important:</strong> before upgrading, please <a href="http://codex.wordpress.org/WordPress_Backups">backup your database and files</a>.');
</del><ins>+ _e('<strong>Important:</strong> before updating, please <a href="http://codex.wordpress.org/WordPress_Backups">backup your database and files</a>.');
</ins><span class="cx"> echo '</p></div>';
</span><span class="cx">
</span><span class="cx"> echo '<h3 class="response">';
</span><del>- _e( 'There is a new version of WordPress available for upgrade' );
</del><ins>+ _e( 'There is a new version of WordPress available for update' );
</ins><span class="cx"> echo '</h3>';
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -175,10 +175,10 @@
</span><span class="cx"> $core_update_version = $core_updates[0]->current;
</span><span class="cx"> ?>
</span><span class="cx"> <h3><?php _e('Plugins'); ?></h3>
</span><del>-<p><?php _e('The following plugins have new versions available. Check the ones you want to upgrade and then click "Upgrade Plugins".'); ?></p>
</del><ins>+<p><?php _e('The following plugins have new versions available. Check the ones you want to update and then click "Update Plugins".'); ?></p>
</ins><span class="cx"> <form method="post" action="<?php echo $form_action; ?>" name="upgrade-plugins" class="upgrade">
</span><span class="cx"> <?php wp_nonce_field('upgrade-core'); ?>
</span><del>-<p><input id="upgrade-plugins" class="button" type="submit" value="<?php esc_attr_e('Upgrade Plugins'); ?>" name="upgrade" /></p>
</del><ins>+<p><input id="upgrade-plugins" class="button" type="submit" value="<?php esc_attr_e('Update Plugins'); ?>" name="upgrade" /></p>
</ins><span class="cx"> <table class="widefat" cellspacing="0" id="update-plugins-table">
</span><span class="cx"> <thead>
</span><span class="cx"> <tr>
</span><span class="lines">@@ -224,13 +224,13 @@
</span><span class="cx"> echo "
</span><span class="cx"> <tr class='active'>
</span><span class="cx"> <th scope='row' class='check-column'><input type='checkbox' name='checked[]' value='" . esc_attr($plugin_file) . "' /></th>
</span><del>- <td class='plugin-title'><strong>{$plugin_data->Name}</strong>" . sprintf(__('You are running version %1$s. Upgrade to %2$s.'), $plugin_data->Version, $plugin_data->update->new_version) . $compat . $upgrade_notice . "</td>
</del><ins>+ <td class='plugin-title'><strong>{$plugin_data->Name}</strong>" . sprintf(__('You are running version %1$s. Update to %2$s.'), $plugin_data->Version, $plugin_data->update->new_version) . $compat . $upgrade_notice . "</td>
</ins><span class="cx"> </tr>";
</span><span class="cx"> }
</span><span class="cx"> ?>
</span><span class="cx"> </tbody>
</span><span class="cx"> </table>
</span><del>-<p><input id="upgrade-plugins-2" class="button" type="submit" value="<?php esc_attr_e('Upgrade Plugins'); ?>" name="upgrade" /></p>
</del><ins>+<p><input id="upgrade-plugins-2" class="button" type="submit" value="<?php esc_attr_e('Update Plugins'); ?>" name="upgrade" /></p>
</ins><span class="cx"> </form>
</span><span class="cx"> <?php
</span><span class="cx"> }
</span><span class="lines">@@ -302,7 +302,7 @@
</span><span class="cx"> ?>
</span><span class="cx"> <div class="wrap">
</span><span class="cx"> <?php screen_icon(); ?>
</span><del>- <h2><?php _e('Upgrade WordPress'); ?></h2>
</del><ins>+ <h2><?php _e('Update WordPress'); ?></h2>
</ins><span class="cx"> <?php
</span><span class="cx"> if ( $wp_filesystem->errors->get_error_code() ) {
</span><span class="cx"> foreach ( $wp_filesystem->errors->get_error_messages() as $message )
</span><span class="lines">@@ -321,7 +321,7 @@
</span><span class="cx"> if ('up_to_date' != $result->get_error_code() )
</span><span class="cx"> show_message( __('Installation Failed') );
</span><span class="cx"> } else {
</span><del>- show_message( __('WordPress upgraded successfully') );
</del><ins>+ show_message( __('WordPress updated successfully') );
</ins><span class="cx"> show_message( '<strong>' . __('Actions:') . '</strong> <a href="' . esc_url( admin_url() ) . '">' . __('Go to Dashboard') . '</a>' );
</span><span class="cx"> }
</span><span class="cx"> echo '</div>';
</span></span></pre>
</div>
</div>
</body>
</html>