<!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>[16701] trunk/wp-admin: More s/upgrade/update.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16701">16701</a></dd>
<dt>Author</dt> <dd>scribu</dd>
<dt>Date</dt> <dd>2010-12-03 09:16:28 +0000 (Fri, 03 Dec 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>More s/upgrade/update. Props michaelh. See <a href="http://trac.wordpress.org/ticket/15656">#15656</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesmediaphp">trunk/wp-admin/includes/media.php</a></li>
<li><a href="#trunkwpadminincludesthemephp">trunk/wp-admin/includes/theme.php</a></li>
<li><a href="#trunkwpadminupdatephp">trunk/wp-admin/update.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesmediaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/media.php (16700 => 16701)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/media.php 2010-12-02 23:49:18 UTC (rev 16700)
+++ trunk/wp-admin/includes/media.php 2010-12-03 09:16:28 UTC (rev 16701)
</span><span class="lines">@@ -1544,7 +1544,7 @@
</span><span class="cx"> <div class="clear"></div>
</span><span class="cx"> <p class="media-upload-size"><?php printf( __( 'Maximum upload file size: %d%s' ), $upload_size_unit, $sizes[$u] ); ?></p>
</span><span class="cx"> <?php if ( is_lighttpd_before_150() ): ?>
</span><del>- <p><?php _e('If you want to use all capabilities of the uploader, like uploading multiple files at once, please upgrade to lighttpd 1.5.'); ?></p>
</del><ins>+ <p><?php _e('If you want to use all capabilities of the uploader, like uploading multiple files at once, please update to lighttpd 1.5.'); ?></p>
</ins><span class="cx"> <?php endif;?>
</span><span class="cx"> <?php do_action('post-html-upload-ui', $flash); ?>
</span><span class="cx"> </div>
</span></span></pre></div>
<a id="trunkwpadminincludesthemephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/theme.php (16700 => 16701)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/theme.php 2010-12-02 23:49:18 UTC (rev 16700)
+++ trunk/wp-admin/includes/theme.php 2010-12-03 09:16:28 UTC (rev 16701)
</span><span class="lines">@@ -239,7 +239,7 @@
</span><span class="cx"> $theme_name = is_object($theme) ? $theme->name : (is_array($theme) ? $theme['Name'] : '');
</span><span class="cx"> $details_url = add_query_arg(array('TB_iframe' => 'true', 'width' => 1024, 'height' => 800), $update['url']); //Theme browser inside WP? replace this, Also, theme preview JS will override this on the available list.
</span><span class="cx"> $update_url = wp_nonce_url('update.php?action=upgrade-theme&amp;theme=' . urlencode($stylesheet), 'upgrade-theme_' . $stylesheet);
</span><del>- $update_onclick = 'onclick="if ( confirm(\'' . esc_js( __("Updating this theme will lose any customizations you have made. 'Cancel' to stop, 'OK' to upgrade.") ) . '\') ) {return true;}return false;"';
</del><ins>+ $update_onclick = 'onclick="if ( confirm(\'' . esc_js( __("Updating this theme will lose any customizations you have made. 'Cancel' to stop, 'OK' to update.") ) . '\') ) {return true;}return false;"';
</ins><span class="cx">
</span><span class="cx"> if ( !is_multisite() ) {
</span><span class="cx"> if ( ! current_user_can('update_themes') )
</span></span></pre></div>
<a id="trunkwpadminupdatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/update.php (16700 => 16701)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/update.php 2010-12-02 23:49:18 UTC (rev 16700)
+++ trunk/wp-admin/update.php 2010-12-03 09:16:28 UTC (rev 16701)
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx">
</span><span class="cx"> check_admin_referer('upgrade-plugin_' . $plugin);
</span><span class="cx">
</span><del>- $title = __('Upgrade Plugin');
</del><ins>+ $title = __('Update Plugin');
</ins><span class="cx"> $parent_file = 'plugins.php';
</span><span class="cx"> $submenu_file = 'plugins.php';
</span><span class="cx"> require_once(ABSPATH . 'wp-admin/admin-header.php');
</span><span class="lines">@@ -155,7 +155,7 @@
</span><span class="cx">
</span><span class="cx"> add_thickbox();
</span><span class="cx"> wp_enqueue_script('theme-preview');
</span><del>- $title = __('Upgrade Theme');
</del><ins>+ $title = __('Update Theme');
</ins><span class="cx"> $parent_file = 'themes.php';
</span><span class="cx"> $submenu_file = 'themes.php';
</span><span class="cx"> require_once(ABSPATH . 'wp-admin/admin-header.php');
</span></span></pre>
</div>
</div>
</body>
</html>