<!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>[15473] trunk: These are not verbs.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15473">15473</a></dd>
<dt>Author</dt> <dd>markjaquith</dd>
<dt>Date</dt> <dd>2010-07-27 18:02:45 +0000 (Tue, 27 Jul 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>These are not verbs. http://notaverb.com/badbad_verbs</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpactivatephp">trunk/wp-activate.php</a></li>
<li><a href="#trunkwpadminincludesupgradephp">trunk/wp-admin/includes/upgrade.php</a></li>
<li><a href="#trunkwpadminnavmenusphp">trunk/wp-admin/nav-menus.php</a></li>
<li><a href="#trunkwpadminupdatecorephp">trunk/wp-admin/update-core.php</a></li>
<li><a href="#trunkwpincludesmediaphp">trunk/wp-includes/media.php</a></li>
<li><a href="#trunkwpincludesmsfunctionsphp">trunk/wp-includes/ms-functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpactivatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-activate.php (15472 => 15473)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-activate.php 2010-07-27 14:23:32 UTC (rev 15472)
+++ trunk/wp-activate.php 2010-07-27 18:02:45 UTC (rev 15473)
</span><span class="lines">@@ -65,7 +65,7 @@
</span><span class="cx"> <?php
</span><span class="cx"> echo '<p class="lead-in">';
</span><span class="cx"> if ( $signup->domain . $signup->path == '' ) {
</span><del>- printf( __('Your account has been activated. You may now <a href="%1$s">login</a> to the site using your chosen username of &#8220;%2$s&#8221;. Please check your email inbox at %3$s for your password and login instructions. If you do not receive an email, please check your junk or spam folder. If you still do not receive an email within an hour, you can <a href="%4$s">reset your password</a>.'), network_site_url( 'wp-login.php', 'login' ), $signup->user_login, $signup->user_email, network_site_url( 'wp-login.php?action=lostpassword', 'login' ) );
</del><ins>+ printf( __('Your account has been activated. You may now <a href="%1$s">log in</a> to the site using your chosen username of &#8220;%2$s&#8221;. Please check your email inbox at %3$s for your password and login instructions. If you do not receive an email, please check your junk or spam folder. If you still do not receive an email within an hour, you can <a href="%4$s">reset your password</a>.'), network_site_url( 'wp-login.php', 'login' ), $signup->user_login, $signup->user_email, network_site_url( 'wp-login.php?action=lostpassword', 'login' ) );
</ins><span class="cx"> } else {
</span><span class="cx"> printf( __('Your site at <a href="%1$s">%2$s</a> is active. You may now log in to your site using your chosen username of &#8220;%3$s&#8221;. Please check your email inbox at %4$s for your password and login instructions. If you do not receive an email, please check your junk or spam folder. If you still do not receive an email within an hour, you can <a href="%5$s">reset your password</a>.'), 'http://' . $signup->domain, $signup->domain, $signup->user_login, $signup->user_email, network_site_url( 'wp-login.php?action=lostpassword' ) );
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpadminincludesupgradephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/upgrade.php (15472 => 15473)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/upgrade.php 2010-07-27 14:23:32 UTC (rev 15472)
+++ trunk/wp-admin/includes/upgrade.php 2010-07-27 18:02:45 UTC (rev 15473)
</span><span class="lines">@@ -266,7 +266,7 @@
</span><span class="cx"> ));
</span><span class="cx"> $wpdb->insert( $wpdb->postmeta, array( 'post_id' => 2, 'meta_key' => '_wp_page_template', 'meta_value' => 'default' ) );
</span><span class="cx">
</span><del>- // Setup default widgets for default theme.
</del><ins>+ // Set up default widgets for default theme.
</ins><span class="cx"> update_option( 'widget_search', array ( 2 => array ( 'title' => '' ), '_multiwidget' => 1 ) );
</span><span class="cx"> update_option( 'widget_recent-posts', array ( 2 => array ( 'title' => '', 'number' => 5 ), '_multiwidget' => 1 ) );
</span><span class="cx"> update_option( 'widget_recent-comments', array ( 2 => array ( 'title' => '', 'number' => 5 ), '_multiwidget' => 1 ) );
</span></span></pre></div>
<a id="trunkwpadminnavmenusphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/nav-menus.php (15472 => 15473)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/nav-menus.php 2010-07-27 14:23:32 UTC (rev 15472)
+++ trunk/wp-admin/nav-menus.php 2010-07-27 18:02:45 UTC (rev 15473)
</span><span class="lines">@@ -70,7 +70,7 @@
</span><span class="cx"> $ordered_menu_items = wp_get_nav_menu_items( $menu_id );
</span><span class="cx"> $menu_item_data = (array) wp_setup_nav_menu_item( get_post( $menu_item_id ) );
</span><span class="cx">
</span><del>- // setup the data we need in one pass through the array of menu items
</del><ins>+ // set up the data we need in one pass through the array of menu items
</ins><span class="cx"> $dbids_to_orders = array();
</span><span class="cx"> $orders_to_dbids = array();
</span><span class="cx"> foreach( (array) $ordered_menu_items as $ordered_menu_item_object ) {
</span><span class="lines">@@ -144,7 +144,7 @@
</span><span class="cx"> $ordered_menu_items = wp_get_nav_menu_items( $menu_id );
</span><span class="cx"> $menu_item_data = (array) wp_setup_nav_menu_item( get_post( $menu_item_id ) );
</span><span class="cx">
</span><del>- // setup the data we need in one pass through the array of menu items
</del><ins>+ // set up the data we need in one pass through the array of menu items
</ins><span class="cx"> $dbids_to_orders = array();
</span><span class="cx"> $orders_to_dbids = array();
</span><span class="cx"> foreach( (array) $ordered_menu_items as $ordered_menu_item_object ) {
</span></span></pre></div>
<a id="trunkwpadminupdatecorephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/update-core.php (15472 => 15473)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/update-core.php 2010-07-27 14:23:32 UTC (rev 15472)
+++ trunk/wp-admin/update-core.php 2010-07-27 18:02:45 UTC (rev 15473)
</span><span class="lines">@@ -131,7 +131,7 @@
</span><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 updating, please <a href="http://codex.wordpress.org/WordPress_Backups">backup your database and files</a>. For help with updates, visit the <a href="http://codex.wordpress.org/Updating_WordPress">Updating WordPress</a> Codex page.');
</del><ins>+ _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.');
</ins><span class="cx"> echo '</p></div>';
</span><span class="cx">
</span><span class="cx"> echo '<h3 class="response">';
</span></span></pre></div>
<a id="trunkwpincludesmediaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/media.php (15472 => 15473)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/media.php 2010-07-27 14:23:32 UTC (rev 15472)
+++ trunk/wp-includes/media.php 2010-07-27 18:02:45 UTC (rev 15473)
</span><span class="lines">@@ -1063,7 +1063,7 @@
</span><span class="cx"> function run_shortcode( $content ) {
</span><span class="cx"> global $shortcode_tags;
</span><span class="cx">
</span><del>- // Backup current registered shortcodes and clear them all out
</del><ins>+ // Back up current registered shortcodes and clear them all out
</ins><span class="cx"> $orig_shortcode_tags = $shortcode_tags;
</span><span class="cx"> remove_all_shortcodes();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludesmsfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/ms-functions.php (15472 => 15473)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ms-functions.php 2010-07-27 14:23:32 UTC (rev 15472)
+++ trunk/wp-includes/ms-functions.php 2010-07-27 18:02:45 UTC (rev 15473)
</span><span class="lines">@@ -284,7 +284,7 @@
</span><span class="cx"> if ( domain_exists($domain, $path, $site_id) )
</span><span class="cx"> return __( 'Error: Site URL already taken.' );
</span><span class="cx">
</span><del>- // Need to backup wpdb table names, and create a new wp_blogs entry for new blog.
</del><ins>+ // Need to back up wpdb table names, and create a new wp_blogs entry for new blog.
</ins><span class="cx"> // Need to get blog_id from wp_blogs, and create new table names.
</span><span class="cx"> // Must restore table names at the end of function.
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>