<!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" />
<title>[19593] trunk: Use one space, not two, after trailing punctuation.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/19593">19593</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2011-12-13 23:45:31 +0000 (Tue, 13 Dec 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use one space, not two, after trailing punctuation. fixes <a href="http://core.trac.wordpress.org/ticket/19537">#19537</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpactivatephp">trunk/wp-activate.php</a></li>
<li><a href="#trunkwpadminadminajaxphp">trunk/wp-admin/admin-ajax.php</a></li>
<li><a href="#trunkwpadmincustomheaderphp">trunk/wp-admin/custom-header.php</a></li>
<li><a href="#trunkwpadmineditformadvancedphp">trunk/wp-admin/edit-form-advanced.php</a></li>
<li><a href="#trunkwpadminedittagsphp">trunk/wp-admin/edit-tags.php</a></li>
<li><a href="#trunkwpadminimportphp">trunk/wp-admin/import.php</a></li>
<li><a href="#trunkwpadminincludesclasswpfilesystemdirectphp">trunk/wp-admin/includes/class-wp-filesystem-direct.php</a></li>
<li><a href="#trunkwpadminincludesclasswpmssiteslisttablephp">trunk/wp-admin/includes/class-wp-ms-sites-list-table.php</a></li>
<li><a href="#trunkwpadminincludesclasswpmsuserslisttablephp">trunk/wp-admin/includes/class-wp-ms-users-list-table.php</a></li>
<li><a href="#trunkwpadminincludesclasswptermslisttablephp">trunk/wp-admin/includes/class-wp-terms-list-table.php</a></li>
<li><a href="#trunkwpadminincludesclasswpthemeslisttablephp">trunk/wp-admin/includes/class-wp-themes-list-table.php</a></li>
<li><a href="#trunkwpadminincludesclasswpupgraderphp">trunk/wp-admin/includes/class-wp-upgrader.php</a></li>
<li><a href="#trunkwpadminincludesclasswpuserslisttablephp">trunk/wp-admin/includes/class-wp-users-list-table.php</a></li>
<li><a href="#trunkwpadminincludesdashboardphp">trunk/wp-admin/includes/dashboard.php</a></li>
<li><a href="#trunkwpadminincludesdeprecatedphp">trunk/wp-admin/includes/deprecated.php</a></li>
<li><a href="#trunkwpadminincludesfilephp">trunk/wp-admin/includes/file.php</a></li>
<li><a href="#trunkwpadminincludesimageeditphp">trunk/wp-admin/includes/image-edit.php</a></li>
<li><a href="#trunkwpadminincludesimagephp">trunk/wp-admin/includes/image.php</a></li>
<li><a href="#trunkwpadminincludesmsphp">trunk/wp-admin/includes/ms.php</a></li>
<li><a href="#trunkwpadminincludesplugininstallphp">trunk/wp-admin/includes/plugin-install.php</a></li>
<li><a href="#trunkwpadminincludespluginphp">trunk/wp-admin/includes/plugin.php</a></li>
<li><a href="#trunkwpadminincludespostphp">trunk/wp-admin/includes/post.php</a></li>
<li><a href="#trunkwpadminincludesschemaphp">trunk/wp-admin/includes/schema.php</a></li>
<li><a href="#trunkwpadminincludesscreenphp">trunk/wp-admin/includes/screen.php</a></li>
<li><a href="#trunkwpadminincludestaxonomyphp">trunk/wp-admin/includes/taxonomy.php</a></li>
<li><a href="#trunkwpadminincludesthemephp">trunk/wp-admin/includes/theme.php</a></li>
<li><a href="#trunkwpadminincludesupgradephp">trunk/wp-admin/includes/upgrade.php</a></li>
<li><a href="#trunkwpadmininstallphp">trunk/wp-admin/install.php</a></li>
<li><a href="#trunkwpadminjscommondevjs">trunk/wp-admin/js/common.dev.js</a></li>
<li><a href="#trunkwpadminmaintrepairphp">trunk/wp-admin/maint/repair.php</a></li>
<li><a href="#trunkwpadminnetworksettingsphp">trunk/wp-admin/network/settings.php</a></li>
<li><a href="#trunkwpadminnetworksiteinfophp">trunk/wp-admin/network/site-info.php</a></li>
<li><a href="#trunkwpadminnetworksitesettingsphp">trunk/wp-admin/network/site-settings.php</a></li>
<li><a href="#trunkwpadminnetworksitethemesphp">trunk/wp-admin/network/site-themes.php</a></li>
<li><a href="#trunkwpadminnetworksiteusersphp">trunk/wp-admin/network/site-users.php</a></li>
<li><a href="#trunkwpadminoptionsdiscussionphp">trunk/wp-admin/options-discussion.php</a></li>
<li><a href="#trunkwpadminoptionsgeneralphp">trunk/wp-admin/options-general.php</a></li>
<li><a href="#trunkwpadminoptionswritingphp">trunk/wp-admin/options-writing.php</a></li>
<li><a href="#trunkwpadminplugineditorphp">trunk/wp-admin/plugin-editor.php</a></li>
<li><a href="#trunkwpadminpluginsphp">trunk/wp-admin/plugins.php</a></li>
<li><a href="#trunkwpadminthemesphp">trunk/wp-admin/themes.php</a></li>
<li><a href="#trunkwpadminupdatecorephp">trunk/wp-admin/update-core.php</a></li>
<li><a href="#trunkwpadminupgradephp">trunk/wp-admin/upgrade.php</a></li>
<li><a href="#trunkwpadminusernewphp">trunk/wp-admin/user-new.php</a></li>
<li><a href="#trunkwpadminusersphp">trunk/wp-admin/users.php</a></li>
<li><a href="#trunkwpappphp">trunk/wp-app.php</a></li>
<li><a href="#trunkwpincludesadminbarphp">trunk/wp-includes/admin-bar.php</a></li>
<li><a href="#trunkwpincludescachephp">trunk/wp-includes/cache.php</a></li>
<li><a href="#trunkwpincludescapabilitiesphp">trunk/wp-includes/capabilities.php</a></li>
<li><a href="#trunkwpincludesclasshttpphp">trunk/wp-includes/class-http.php</a></li>
<li><a href="#trunkwpincludesclasswpxmlrpcserverphp">trunk/wp-includes/class-wp-xmlrpc-server.php</a></li>
<li><a href="#trunkwpincludesclasswpphp">trunk/wp-includes/class-wp.php</a></li>
<li><a href="#trunkwpincludesclasswpdependenciesphp">trunk/wp-includes/class.wp-dependencies.php</a></li>
<li><a href="#trunkwpincludesclasswpscriptsphp">trunk/wp-includes/class.wp-scripts.php</a></li>
<li><a href="#trunkwpincludescommenttemplatephp">trunk/wp-includes/comment-template.php</a></li>
<li><a href="#trunkwpincludescommentphp">trunk/wp-includes/comment.php</a></li>
<li><a href="#trunkwpincludescronphp">trunk/wp-includes/cron.php</a></li>
<li><a href="#trunkwpincludesdefaultconstantsphp">trunk/wp-includes/default-constants.php</a></li>
<li><a href="#trunkwpincludesformattingphp">trunk/wp-includes/formatting.php</a></li>
<li><a href="#trunkwpincludesfunctionsphp">trunk/wp-includes/functions.php</a></li>
<li><a href="#trunkwpincludesgeneraltemplatephp">trunk/wp-includes/general-template.php</a></li>
<li><a href="#trunkwpincludeshttpphp">trunk/wp-includes/http.php</a></li>
<li><a href="#trunkwpincludesjsautosavedevjs">trunk/wp-includes/js/autosave.dev.js</a></li>
<li><a href="#trunkwpincludesksesphp">trunk/wp-includes/kses.php</a></li>
<li><a href="#trunkwpincludeslinktemplatephp">trunk/wp-includes/link-template.php</a></li>
<li><a href="#trunkwpincludesloadphp">trunk/wp-includes/load.php</a></li>
<li><a href="#trunkwpincludeslocalephp">trunk/wp-includes/locale.php</a></li>
<li><a href="#trunkwpincludesmediaphp">trunk/wp-includes/media.php</a></li>
<li><a href="#trunkwpincludesmetaphp">trunk/wp-includes/meta.php</a></li>
<li><a href="#trunkwpincludesmsfunctionsphp">trunk/wp-includes/ms-functions.php</a></li>
<li><a href="#trunkwpincludesnavmenutemplatephp">trunk/wp-includes/nav-menu-template.php</a></li>
<li><a href="#trunkwpincludesnavmenuphp">trunk/wp-includes/nav-menu.php</a></li>
<li><a href="#trunkwpincludespluggablephp">trunk/wp-includes/pluggable.php</a></li>
<li><a href="#trunkwpincludespluginphp">trunk/wp-includes/plugin.php</a></li>
<li><a href="#trunkwpincludesposttemplatephp">trunk/wp-includes/post-template.php</a></li>
<li><a href="#trunkwpincludespostthumbnailtemplatephp">trunk/wp-includes/post-thumbnail-template.php</a></li>
<li><a href="#trunkwpincludespostphp">trunk/wp-includes/post.php</a></li>
<li><a href="#trunkwpincludesqueryphp">trunk/wp-includes/query.php</a></li>
<li><a href="#trunkwpincludesrewritephp">trunk/wp-includes/rewrite.php</a></li>
<li><a href="#trunkwpincludesrssfunctionsphp">trunk/wp-includes/rss-functions.php</a></li>
<li><a href="#trunkwpincludestaxonomyphp">trunk/wp-includes/taxonomy.php</a></li>
<li><a href="#trunkwpincludesthemephp">trunk/wp-includes/theme.php</a></li>
<li><a href="#trunkwpincludesuserphp">trunk/wp-includes/user.php</a></li>
<li><a href="#trunkwpincludeswpdbphp">trunk/wp-includes/wp-db.php</a></li>
<li><a href="#trunkwpincludeswpdiffphp">trunk/wp-includes/wp-diff.php</a></li>
<li><a href="#trunkwploginphp">trunk/wp-login.php</a></li>
<li><a href="#trunkwpmailphp">trunk/wp-mail.php</a></li>
<li><a href="#trunkwpsignupphp">trunk/wp-signup.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpactivatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-activate.php (19592 => 19593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-activate.php 2011-12-12 22:25:58 UTC (rev 19592)
+++ trunk/wp-activate.php 2011-12-13 23:45:31 UTC (rev 19593)
</span><span class="lines">@@ -63,9 +63,9 @@
</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">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, wp_lostpassword_url() );
</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, wp_lostpassword_url() );
</ins><span class="cx"> } else {
</span><del>- 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, wp_lostpassword_url() );
</del><ins>+ 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, wp_lostpassword_url() );
</ins><span class="cx"> }
</span><span class="cx"> echo '</p>';
</span><span class="cx"> } else {
</span></span></pre></div>
<a id="trunkwpadminadminajaxphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/admin-ajax.php (19592 => 19593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/admin-ajax.php 2011-12-12 22:25:58 UTC (rev 19592)
+++ trunk/wp-admin/admin-ajax.php 2011-12-13 23:45:31 UTC (rev 19593)
</span><span class="lines">@@ -970,7 +970,7 @@
</span><span class="cx"> // Drafts and auto-drafts are just overwritten by autosave
</span><span class="cx"> if ( 'auto-draft' == $post->post_status || 'draft' == $post->post_status ) {
</span><span class="cx"> $id = edit_post();
</span><del>- } else { // Non drafts are not overwritten. The autosave is stored in a special post revision.
</del><ins>+ } else { // Non drafts are not overwritten. The autosave is stored in a special post revision.
</ins><span class="cx"> $revision_id = wp_create_post_autosave( $post->ID );
</span><span class="cx"> if ( is_wp_error($revision_id) )
</span><span class="cx"> $id = $revision_id;
</span></span></pre></div>
<a id="trunkwpadmincustomheaderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/custom-header.php (19592 => 19593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/custom-header.php 2011-12-12 22:25:58 UTC (rev 19592)
+++ trunk/wp-admin/custom-header.php 2011-12-13 23:45:31 UTC (rev 19593)
</span><span class="lines">@@ -676,7 +676,7 @@
</span><span class="cx"> $oitar = $width / HEADER_IMAGE_WIDTH;
</span><span class="cx"> $image = wp_crop_image($file, 0, 0, $width, $height, HEADER_IMAGE_WIDTH, $height / $oitar, false, str_replace(basename($file), 'midsize-'.basename($file), $file));
</span><span class="cx"> if ( is_wp_error( $image ) )
</span><del>- wp_die( __( 'Image could not be processed. Please go back and try again.' ), __( 'Image Processing Error' ) );
</del><ins>+ wp_die( __( 'Image could not be processed. Please go back and try again.' ), __( 'Image Processing Error' ) );
</ins><span class="cx">
</span><span class="cx"> $image = apply_filters('wp_create_file_in_uploads', $image, $id); // For replication
</span><span class="cx">
</span><span class="lines">@@ -737,7 +737,7 @@
</span><span class="cx">
</span><span class="cx"> $cropped = wp_crop_image( $attachment_id, (int) $_POST['x1'], (int) $_POST['y1'], (int) $_POST['width'], (int) $_POST['height'], HEADER_IMAGE_WIDTH, HEADER_IMAGE_HEIGHT );
</span><span class="cx"> if ( is_wp_error( $cropped ) )
</span><del>- wp_die( __( 'Image could not be processed. Please go back and try again.' ), __( 'Image Processing Error' ) );
</del><ins>+ wp_die( __( 'Image could not be processed. Please go back and try again.' ), __( 'Image Processing Error' ) );
</ins><span class="cx">
</span><span class="cx"> $cropped = apply_filters('wp_create_file_in_uploads', $cropped, $attachment_id); // For replication
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadmineditformadvancedphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit-form-advanced.php (19592 => 19593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit-form-advanced.php 2011-12-12 22:25:58 UTC (rev 19592)
+++ trunk/wp-admin/edit-form-advanced.php 2011-12-13 23:45:31 UTC (rev 19593)
</span><span class="lines">@@ -87,7 +87,7 @@
</span><span class="cx"> if ( $autosave && mysql2date( 'U', $autosave->post_modified_gmt, false ) > mysql2date( 'U', $post->post_modified_gmt, false ) ) {
</span><span class="cx"> foreach ( _wp_post_revision_fields() as $autosave_field => $_autosave_field ) {
</span><span class="cx"> if ( normalize_whitespace( $autosave->$autosave_field ) != normalize_whitespace( $post->$autosave_field ) ) {
</span><del>- $notice = sprintf( __( 'There is an autosave of this post that is more recent than the version below. <a href="%s">View the autosave</a>' ), get_edit_post_link( $autosave->ID ) );
</del><ins>+ $notice = sprintf( __( 'There is an autosave of this post that is more recent than the version below. <a href="%s">View the autosave</a>' ), get_edit_post_link( $autosave->ID ) );
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpadminedittagsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit-tags.php (19592 => 19593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit-tags.php 2011-12-12 22:25:58 UTC (rev 19592)
+++ trunk/wp-admin/edit-tags.php 2011-12-13 23:45:31 UTC (rev 19593)
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $tag_ID = (int) $_REQUEST['tag_ID'];
</span><del>- check_admin_referer( 'delete-tag_' . $tag_ID );
</del><ins>+ check_admin_referer( 'delete-tag_' . $tag_ID );
</ins><span class="cx">
</span><span class="cx"> if ( !current_user_can( $tax->cap->delete_terms ) )
</span><span class="cx"> wp_die( __( 'Cheatin&#8217; uh?' ) );
</span></span></pre></div>
<a id="trunkwpadminimportphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/import.php (19592 => 19593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/import.php 2011-12-12 22:25:58 UTC (rev 19592)
+++ trunk/wp-admin/import.php 2011-12-13 23:45:31 UTC (rev 19593)
</span><span class="lines">@@ -20,7 +20,7 @@
</span><span class="cx"> 'id' => 'overview',
</span><span class="cx"> 'title' => __('Overview'),
</span><span class="cx"> 'content' => '<p>' . __('This screen lists links to plugins to import data from blogging/content management platforms. Choose the platform you want to import from, and click Install Now when you are prompted in the popup window. If your platform is not listed, click the link to search the plugin directory for other importer plugins to see if there is one for your platform.') . '</p>' .
</span><del>- '<p>' . __('In previous versions of WordPress, all importers were built-in. They have been turned into plugins since most people only use them once or infrequently.') . '</p>',
</del><ins>+ '<p>' . __('In previous versions of WordPress, all importers were built-in. They have been turned into plugins since most people only use them once or infrequently.') . '</p>',
</ins><span class="cx"> ) );
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminincludesclasswpfilesystemdirectphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-filesystem-direct.php (19592 => 19593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-filesystem-direct.php 2011-12-12 22:25:58 UTC (rev 19592)
+++ trunk/wp-admin/includes/class-wp-filesystem-direct.php 2011-12-13 23:45:31 UTC (rev 19593)
</span><span class="lines">@@ -207,7 +207,7 @@
</span><span class="cx"> if ( ! $overwrite && $this->exists($destination) )
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- // try using rename first. if that fails (for example, source is read only) try copy
</del><ins>+ // try using rename first. if that fails (for example, source is read only) try copy
</ins><span class="cx"> if ( @rename($source, $destination) )
</span><span class="cx"> return true;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminincludesclasswpmssiteslisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-ms-sites-list-table.php (19592 => 19593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-ms-sites-list-table.php 2011-12-12 22:25:58 UTC (rev 19592)
+++ trunk/wp-admin/includes/class-wp-ms-sites-list-table.php 2011-12-13 23:45:31 UTC (rev 19593)
</span><span class="lines">@@ -251,7 +251,7 @@
</span><span class="cx"> $actions['deactivate'] = '<span class="activate"><a href="' . esc_url( wp_nonce_url( network_admin_url( 'sites.php?action=confirm&amp;action2=deactivateblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( 'You are about to deactivate the site %s' ), $blogname ) ) ), 'confirm') ) . '">' . __( 'Deactivate' ) . '</a></span>';
</span><span class="cx">
</span><span class="cx"> if ( get_blog_status( $blog['blog_id'], 'archived' ) == '1' )
</span><del>- $actions['unarchive'] = '<span class="archive"><a href="' . esc_url( wp_nonce_url( network_admin_url( 'sites.php?action=confirm&amp;action2=unarchiveblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( 'You are about to unarchive the site %s.' ), $blogname ) ) ), 'confirm') ) . '">' . __( 'Unarchive' ) . '</a></span>';
</del><ins>+ $actions['unarchive'] = '<span class="archive"><a href="' . esc_url( wp_nonce_url( network_admin_url( 'sites.php?action=confirm&amp;action2=unarchiveblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( 'You are about to unarchive the site %s.' ), $blogname ) ) ), 'confirm') ) . '">' . __( 'Unarchive' ) . '</a></span>';
</ins><span class="cx"> else
</span><span class="cx"> $actions['archive'] = '<span class="archive"><a href="' . esc_url( wp_nonce_url( network_admin_url( 'sites.php?action=confirm&amp;action2=archiveblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( 'You are about to archive the site %s.' ), $blogname ) ) ), 'confirm') ) . '">' . _x( 'Archive', 'verb; site' ) . '</a></span>';
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminincludesclasswpmsuserslisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-ms-users-list-table.php (19592 => 19593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-ms-users-list-table.php 2011-12-12 22:25:58 UTC (rev 19592)
+++ trunk/wp-admin/includes/class-wp-ms-users-list-table.php 2011-12-13 23:45:31 UTC (rev 19593)
</span><span class="lines">@@ -242,7 +242,7 @@
</span><span class="cx"> if ( get_blog_status( $val->userblog_id, 'archived' ) == 1 )
</span><span class="cx"> $class .= 'site-archived ';
</span><span class="cx">
</span><del>- $actions['view'] = '<a class="' . $class . '" href="' . esc_url( get_home_url( $val->userblog_id ) ) . '">' . __( 'View' ) . '</a>';
</del><ins>+ $actions['view'] = '<a class="' . $class . '" href="' . esc_url( get_home_url( $val->userblog_id ) ) . '">' . __( 'View' ) . '</a>';
</ins><span class="cx">
</span><span class="cx"> $actions = apply_filters('ms_user_list_site_actions', $actions, $val->userblog_id);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminincludesclasswptermslisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-terms-list-table.php (19592 => 19593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-terms-list-table.php 2011-12-12 22:25:58 UTC (rev 19592)
+++ trunk/wp-admin/includes/class-wp-terms-list-table.php 2011-12-13 23:45:31 UTC (rev 19593)
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx"> function prepare_items() {
</span><span class="cx"> global $taxonomy;
</span><span class="cx">
</span><del>- $tags_per_page = $this->get_items_per_page( 'edit_' . $taxonomy . '_per_page' );
</del><ins>+ $tags_per_page = $this->get_items_per_page( 'edit_' . $taxonomy . '_per_page' );
</ins><span class="cx">
</span><span class="cx"> if ( 'post_tag' == $taxonomy ) {
</span><span class="cx"> $tags_per_page = apply_filters( 'edit_tags_per_page', $tags_per_page );
</span></span></pre></div>
<a id="trunkwpadminincludesclasswpthemeslisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-themes-list-table.php (19592 => 19593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-themes-list-table.php 2011-12-12 22:25:58 UTC (rev 19592)
+++ trunk/wp-admin/includes/class-wp-themes-list-table.php 2011-12-13 23:45:31 UTC (rev 19593)
</span><span class="lines">@@ -149,7 +149,7 @@
</span><span class="cx"> $activate_link = wp_nonce_url( "themes.php?action=activate&amp;template=".urlencode( $template )."&amp;stylesheet=".urlencode( $stylesheet ), 'switch-theme_' . $template );
</span><span class="cx"> $activate_text = esc_attr( sprintf( __( 'Activate &#8220;%s&#8221;' ), $title ) );
</span><span class="cx"> $actions = array();
</span><del>- $actions[] = '<a href="' . $activate_link . '" class="activatelink" title="' . $activate_text . '">' . __( 'Activate' ) . '</a>';
</del><ins>+ $actions[] = '<a href="' . $activate_link . '" class="activatelink" title="' . $activate_text . '">' . __( 'Activate' ) . '</a>';
</ins><span class="cx"> $actions[] = '<a href="' . $preview_link . '" class="thickbox thickbox-preview" title="' . esc_attr( sprintf( __( 'Preview &#8220;%s&#8221;' ), $theme_name ) ) . '">' . __( 'Preview' ) . '</a>';
</span><span class="cx"> if ( ! is_multisite() && current_user_can( 'delete_themes' ) )
</span><span class="cx"> $actions[] = '<a class="submitdelete deletion" href="' . wp_nonce_url( "themes.php?action=delete&amp;template=$stylesheet", 'delete-theme_' . $stylesheet ) . '" onclick="' . "return confirm( '" . esc_js( sprintf( __( "You are about to delete this theme '%s'\n 'Cancel' to stop, 'OK' to delete." ), $theme_name ) ) . "' );" . '">' . __( 'Delete' ) . '</a>';
</span></span></pre></div>
<a id="trunkwpadminincludesclasswpupgraderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-upgrader.php (19592 => 19593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-upgrader.php 2011-12-12 22:25:58 UTC (rev 19592)
+++ trunk/wp-admin/includes/class-wp-upgrader.php 2011-12-13 23:45:31 UTC (rev 19593)
</span><span class="lines">@@ -1419,7 +1419,7 @@
</span><span class="cx">
</span><span class="cx"> $install_actions = array(
</span><span class="cx"> 'preview' => '<a href="' . $preview_link . '" class="thickbox thickbox-preview" title="' . esc_attr(sprintf(__('Preview &#8220;%s&#8221;'), $name)) . '">' . __('Preview') . '</a>',
</span><del>- 'activate' => '<a href="' . $activate_link . '" class="activatelink" title="' . esc_attr( sprintf( __('Activate &#8220;%s&#8221;'), $name ) ) . '">' . __('Activate') . '</a>'
</del><ins>+ 'activate' => '<a href="' . $activate_link . '" class="activatelink" title="' . esc_attr( sprintf( __('Activate &#8220;%s&#8221;'), $name ) ) . '">' . __('Activate') . '</a>'
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> if ( is_network_admin() && current_user_can( 'manage_network_themes' ) )
</span><span class="lines">@@ -1475,7 +1475,7 @@
</span><span class="cx"> $activate_link = wp_nonce_url("themes.php?action=activate&amp;template=" . urlencode($template) . "&amp;stylesheet=" . urlencode($stylesheet), 'switch-theme_' . $template);
</span><span class="cx">
</span><span class="cx"> $update_actions['preview'] = '<a href="' . $preview_link . '" class="thickbox thickbox-preview" title="' . esc_attr(sprintf(__('Preview &#8220;%s&#8221;'), $name)) . '">' . __('Preview') . '</a>';
</span><del>- $update_actions['activate'] = '<a href="' . $activate_link . '" class="activatelink" title="' . esc_attr( sprintf( __('Activate &#8220;%s&#8221;'), $name ) ) . '">' . __('Activate') . '</a>';
</del><ins>+ $update_actions['activate'] = '<a href="' . $activate_link . '" class="activatelink" title="' . esc_attr( sprintf( __('Activate &#8220;%s&#8221;'), $name ) ) . '">' . __('Activate') . '</a>';
</ins><span class="cx">
</span><span class="cx"> if ( ( ! $this->result || is_wp_error($this->result) ) || $stylesheet == get_stylesheet() )
</span><span class="cx"> unset($update_actions['preview'], $update_actions['activate']);
</span></span></pre></div>
<a id="trunkwpadminincludesclasswpuserslisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-users-list-table.php (19592 => 19593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-users-list-table.php 2011-12-12 22:25:58 UTC (rev 19592)
+++ trunk/wp-admin/includes/class-wp-users-list-table.php 2011-12-13 23:45:31 UTC (rev 19593)
</span><span class="lines">@@ -209,9 +209,9 @@
</span><span class="cx"> * @since 2.1.0
</span><span class="cx"> *
</span><span class="cx"> * @param object $user_object
</span><del>- * @param string $style Optional. Attributes added to the TR element. Must be sanitized.
</del><ins>+ * @param string $style Optional. Attributes added to the TR element. Must be sanitized.
</ins><span class="cx"> * @param string $role Key for the $wp_roles array.
</span><del>- * @param int $numposts Optional. Post count to display for this user. Defaults to zero, as in, a new user has made zero posts.
</del><ins>+ * @param int $numposts Optional. Post count to display for this user. Defaults to zero, as in, a new user has made zero posts.
</ins><span class="cx"> * @return string
</span><span class="cx"> */
</span><span class="cx"> function single_row( $user_object, $style = '', $role = '', $numposts = 0 ) {
</span></span></pre></div>
<a id="trunkwpadminincludesdashboardphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/dashboard.php (19592 => 19593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/dashboard.php 2011-12-12 22:25:58 UTC (rev 19592)
+++ trunk/wp-admin/includes/dashboard.php 2011-12-13 23:45:31 UTC (rev 19593)
</span><span class="lines">@@ -273,7 +273,7 @@
</span><span class="cx">
</span><span class="cx"> echo '</tr><tr>';
</span><span class="cx"> /* TODO: Show status breakdown on hover
</span><del>- if ( $can_edit_pages && !empty($num_pages->publish) ) { // how many pages is not exposed in feeds. Don't show if !current_user_can
</del><ins>+ if ( $can_edit_pages && !empty($num_pages->publish) ) { // how many pages is not exposed in feeds. Don't show if !current_user_can
</ins><span class="cx"> $post_type_texts[] = '<a href="edit-pages.php">'.sprintf( _n( '%s page', '%s pages', $num_pages->publish ), number_format_i18n( $num_pages->publish ) ).'</a>';
</span><span class="cx"> }
</span><span class="cx"> if ( $can_edit_posts && !empty($num_posts->draft) ) {
</span><span class="lines">@@ -1115,7 +1115,7 @@
</span><span class="cx"> if ( 'POST' == $_SERVER['REQUEST_METHOD'] && isset($_POST['widget-rss'][$number]) ) {
</span><span class="cx"> $_POST['widget-rss'][$number] = stripslashes_deep( $_POST['widget-rss'][$number] );
</span><span class="cx"> $widget_options[$widget_id] = wp_widget_rss_process( $_POST['widget-rss'][$number] );
</span><del>- // title is optional. If black, fill it if possible
</del><ins>+ // title is optional. If black, fill it if possible
</ins><span class="cx"> if ( !$widget_options[$widget_id]['title'] && isset($_POST['widget-rss'][$number]['title']) ) {
</span><span class="cx"> $rss = fetch_feed($widget_options[$widget_id]['url']);
</span><span class="cx"> if ( is_wp_error($rss) ) {
</span></span></pre></div>
<a id="trunkwpadminincludesdeprecatedphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/deprecated.php (19592 => 19593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/deprecated.php 2011-12-12 22:25:58 UTC (rev 19592)
+++ trunk/wp-admin/includes/deprecated.php 2011-12-13 23:45:31 UTC (rev 19593)
</span><span class="lines">@@ -133,7 +133,7 @@
</span><span class="cx"> * @deprecated Use register_setting()
</span><span class="cx"> * @see register_setting()
</span><span class="cx"> *
</span><del>- * @param string $option_group A settings group name. Should correspond to a whitelisted option key name.
</del><ins>+ * @param string $option_group A settings group name. Should correspond to a whitelisted option key name.
</ins><span class="cx"> * Default whitelisted option key names include "general," "discussion," and "reading," among others.
</span><span class="cx"> * @param string $option_name The name of an option to sanitize and save.
</span><span class="cx"> * @param unknown_type $sanitize_callback A callback function that sanitizes the option's value.
</span><span class="lines">@@ -870,7 +870,7 @@
</span><span class="cx"> * @deprecated Use get_current_screen()->add_help_tab()
</span><span class="cx"> * @see WP_Screen
</span><span class="cx"> *
</span><del>- * @param string $screen The handle for the screen to add help to. This is usually the hook name returned by the add_*_page() functions.
</del><ins>+ * @param string $screen The handle for the screen to add help to. This is usually the hook name returned by the add_*_page() functions.
</ins><span class="cx"> * @param string $help The content of an 'Overview' help tab.
</span><span class="cx"> */
</span><span class="cx"> function add_contextual_help( $screen, $help ) {
</span></span></pre></div>
<a id="trunkwpadminincludesfilephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/file.php (19592 => 19593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/file.php 2011-12-12 22:25:58 UTC (rev 19592)
+++ trunk/wp-admin/includes/file.php 2011-12-13 23:45:31 UTC (rev 19593)
</span><span class="lines">@@ -240,7 +240,7 @@
</span><span class="cx"> // You may define your own function and pass the name in $overrides['upload_error_handler']
</span><span class="cx"> $upload_error_handler = 'wp_handle_upload_error';
</span><span class="cx">
</span><del>- // You may have had one or more 'wp_handle_upload_prefilter' functions error out the file. Handle that gracefully.
</del><ins>+ // You may have had one or more 'wp_handle_upload_prefilter' functions error out the file. Handle that gracefully.
</ins><span class="cx"> if ( isset( $file['error'] ) && !is_numeric( $file['error'] ) && $file['error'] )
</span><span class="cx"> return $upload_error_handler( $file, $file['error'] );
</span><span class="cx">
</span><span class="lines">@@ -364,7 +364,7 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Handle sideloads, which is the process of retrieving a media item from another server instead of
</span><del>- * a traditional media upload. This process involves sanitizing the filename, checking extensions
</del><ins>+ * a traditional media upload. This process involves sanitizing the filename, checking extensions
</ins><span class="cx"> * for mime type, and moving the file to the appropriate directory within the uploads directory.
</span><span class="cx"> *
</span><span class="cx"> * @since 2.6.0
</span></span></pre></div>
<a id="trunkwpadminincludesimageeditphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/image-edit.php (19592 => 19593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/image-edit.php 2011-12-12 22:25:58 UTC (rev 19592)
+++ trunk/wp-admin/includes/image-edit.php 2011-12-13 23:45:31 UTC (rev 19593)
</span><span class="lines">@@ -192,7 +192,7 @@
</span><span class="cx"> </tbody></table>
</span><span class="cx"> <div class="imgedit-wait" id="imgedit-wait-<?php echo $post_id; ?>"></div>
</span><span class="cx"> <script type="text/javascript">imageEdit.init(<?php echo $post_id; ?>);</script>
</span><del>- <div class="hidden" id="imgedit-leaving-<?php echo $post_id; ?>"><?php _e("There are unsaved changes that will be lost. 'OK' to continue, 'Cancel' to return to the Image Editor."); ?></div>
</del><ins>+ <div class="hidden" id="imgedit-leaving-<?php echo $post_id; ?>"><?php _e("There are unsaved changes that will be lost. 'OK' to continue, 'Cancel' to return to the Image Editor."); ?></div>
</ins><span class="cx"> </div>
</span><span class="cx"> <?php
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpadminincludesimagephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/image.php (19592 => 19593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/image.php 2011-12-12 22:25:58 UTC (rev 19592)
+++ trunk/wp-admin/includes/image.php 2011-12-13 23:45:31 UTC (rev 19593)
</span><span class="lines">@@ -205,7 +205,7 @@
</span><span class="cx">
</span><span class="cx"> // exif contains a bunch of data we'll probably never need formatted in ways
</span><span class="cx"> // that are difficult to use. We'll normalize it and just extract the fields
</span><del>- // that are likely to be useful. Fractions and numbers are converted to
</del><ins>+ // that are likely to be useful. Fractions and numbers are converted to
</ins><span class="cx"> // floats, dates to unix timestamps, and everything else to strings.
</span><span class="cx"> $meta = array(
</span><span class="cx"> 'aperture' => 0,
</span></span></pre></div>
<a id="trunkwpadminincludesmsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/ms.php (19592 => 19593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/ms.php 2011-12-12 22:25:58 UTC (rev 19592)
+++ trunk/wp-admin/includes/ms.php 2011-12-13 23:45:31 UTC (rev 19593)
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx"> * @since 3.0.0
</span><span class="cx"> *
</span><span class="cx"> * @param int $blog_id Blog ID
</span><del>- * @param bool $drop True if blog's table should be dropped. Default is false.
</del><ins>+ * @param bool $drop True if blog's table should be dropped. Default is false.
</ins><span class="cx"> * @return void
</span><span class="cx"> */
</span><span class="cx"> function wpmu_delete_blog( $blog_id, $drop = false ) {
</span><span class="lines">@@ -774,7 +774,7 @@
</span><span class="cx"> * Plugins can alter this criteria using the 'wp_is_large_network' filter.
</span><span class="cx"> *
</span><span class="cx"> * @since 3.3.0
</span><del>- * @param string $using 'sites or 'users'. Default is 'sites'.
</del><ins>+ * @param string $using 'sites or 'users'. Default is 'sites'.
</ins><span class="cx"> * @return bool True if the network meets the criteria for large. False otherwise.
</span><span class="cx"> */
</span><span class="cx"> function wp_is_large_network( $using = 'sites' ) {
</span></span></pre></div>
<a id="trunkwpadminincludesplugininstallphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/plugin-install.php (19592 => 19593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/plugin-install.php 2011-12-12 22:25:58 UTC (rev 19592)
+++ trunk/wp-admin/includes/plugin-install.php 2011-12-13 23:45:31 UTC (rev 19593)
</span><span class="lines">@@ -199,7 +199,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( 'install' == $status ) {
</span><del>- if ( is_dir( WP_PLUGIN_DIR . '/' . $api->slug ) ) {
</del><ins>+ if ( is_dir( WP_PLUGIN_DIR . '/' . $api->slug ) ) {
</ins><span class="cx"> $installed_plugin = get_plugins('/' . $api->slug);
</span><span class="cx"> if ( empty($installed_plugin) ) {
</span><span class="cx"> if ( current_user_can('install_plugins') )
</span></span></pre></div>
<a id="trunkwpadminincludespluginphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/plugin.php (19592 => 19593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/plugin.php 2011-12-12 22:25:58 UTC (rev 19592)
+++ trunk/wp-admin/includes/plugin.php 2011-12-13 23:45:31 UTC (rev 19593)
</span><span class="lines">@@ -985,8 +985,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // If the parent doesn't already have a submenu, add a link to the parent
</span><del>- // as the first item in the submenu. If the submenu file is the same as the
- // parent file someone is trying to link back to the parent manually. In
</del><ins>+ // as the first item in the submenu. If the submenu file is the same as the
+ // parent file someone is trying to link back to the parent manually. In
</ins><span class="cx"> // this case, don't automatically add a link back to avoid duplication.
</span><span class="cx"> if (!isset( $submenu[$parent_slug] ) && $menu_slug != $parent_slug ) {
</span><span class="cx"> foreach ( (array)$menu as $parent_menu ) {
</span><span class="lines">@@ -1002,7 +1002,7 @@
</span><span class="cx"> add_action( $hookname, $function );
</span><span class="cx">
</span><span class="cx"> $_registered_pages[$hookname] = true;
</span><del>- // backwards-compatibility for plugins using add_management page. See wp-admin/admin.php for redirect from edit.php to tools.php
</del><ins>+ // backwards-compatibility for plugins using add_management page. See wp-admin/admin.php for redirect from edit.php to tools.php
</ins><span class="cx"> if ( 'tools.php' == $parent_slug )
</span><span class="cx"> $_registered_pages[get_plugin_page_hookname( $menu_slug, 'edit.php')] = true;
</span><span class="cx">
</span><span class="lines">@@ -1589,7 +1589,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @since 2.7.0
</span><span class="cx"> *
</span><del>- * @param string $option_group A settings group name. Should correspond to a whitelisted option key name.
</del><ins>+ * @param string $option_group A settings group name. Should correspond to a whitelisted option key name.
</ins><span class="cx"> * Default whitelisted option key names include "general," "discussion," and "reading," among others.
</span><span class="cx"> * @param string $option_name The name of an option to sanitize and save.
</span><span class="cx"> * @param unknown_type $sanitize_callback A callback function that sanitizes the option's value.
</span><span class="lines">@@ -1715,7 +1715,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @since 2.7.0
</span><span class="cx"> *
</span><del>- * @param string $option_group A settings group name. This should match the group name used in register_setting().
</del><ins>+ * @param string $option_group A settings group name. This should match the group name used in register_setting().
</ins><span class="cx"> */
</span><span class="cx"> function settings_fields($option_group) {
</span><span class="cx"> echo "<input type='hidden' name='option_page' value='" . esc_attr($option_group) . "' />";
</span></span></pre></div>
<a id="trunkwpadminincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/post.php (19592 => 19593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/post.php 2011-12-12 22:25:58 UTC (rev 19592)
+++ trunk/wp-admin/includes/post.php 2011-12-13 23:45:31 UTC (rev 19593)
</span><span class="lines">@@ -1259,7 +1259,7 @@
</span><span class="cx"> if ( is_wp_error( $translated ) )
</span><span class="cx"> return $translated;
</span><span class="cx">
</span><del>- // Only store one autosave. If there is already an autosave, overwrite it.
</del><ins>+ // Only store one autosave. If there is already an autosave, overwrite it.
</ins><span class="cx"> if ( $old_autosave = wp_get_post_autosave( $post_id ) ) {
</span><span class="cx"> $new_autosave = _wp_post_revision_fields( $_POST, true );
</span><span class="cx"> $new_autosave['ID'] = $old_autosave->ID;
</span><span class="lines">@@ -1320,7 +1320,7 @@
</span><span class="cx">
</span><span class="cx"> if ( 'draft' == $post->post_status ) {
</span><span class="cx"> $id = edit_post();
</span><del>- } else { // Non drafts are not overwritten. The autosave is stored in a special post revision.
</del><ins>+ } else { // Non drafts are not overwritten. The autosave is stored in a special post revision.
</ins><span class="cx"> $id = wp_create_post_autosave( $post->ID );
</span><span class="cx"> if ( ! is_wp_error($id) )
</span><span class="cx"> $id = $post->ID;
</span></span></pre></div>
<a id="trunkwpadminincludesschemaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/schema.php (19592 => 19593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/schema.php 2011-12-12 22:25:58 UTC (rev 19592)
+++ trunk/wp-admin/includes/schema.php 2011-12-13 23:45:31 UTC (rev 19593)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx"> * @since 3.3.0
</span><span class="cx"> *
</span><span class="cx"> * @param string $scope Optional. The tables for which to retrieve SQL. Can be all, global, ms_global, or blog tables. Defaults to all.
</span><del>- * @param int $blog_id Optional. The blog ID for which to retrieve SQL. Default is the current blog ID.
</del><ins>+ * @param int $blog_id Optional. The blog ID for which to retrieve SQL. Default is the current blog ID.
</ins><span class="cx"> * @return string The SQL needed to create the requested tables.
</span><span class="cx"> */
</span><span class="cx"> function wp_get_db_schema( $scope = 'all', $blog_id = null ) {
</span></span></pre></div>
<a id="trunkwpadminincludesscreenphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/screen.php (19592 => 19593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/screen.php 2011-12-12 22:25:58 UTC (rev 19592)
+++ trunk/wp-admin/includes/screen.php 2011-12-13 23:45:31 UTC (rev 19593)
</span><span class="lines">@@ -208,7 +208,7 @@
</span><span class="cx"> */
</span><span class="cx"> final class WP_Screen {
</span><span class="cx"> /**
</span><del>- * Any action associated with the screen. 'add' for *-add.php and *-new.php screens. Empty otherwise.
</del><ins>+ * Any action associated with the screen. 'add' for *-add.php and *-new.php screens. Empty otherwise.
</ins><span class="cx"> *
</span><span class="cx"> * @since 3.3.0
</span><span class="cx"> * @var string
</span><span class="lines">@@ -217,7 +217,7 @@
</span><span class="cx"> public $action;
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * The base type of the screen. This is typically the same as $id but with any post types and taxonomies stripped.
</del><ins>+ * The base type of the screen. This is typically the same as $id but with any post types and taxonomies stripped.
</ins><span class="cx"> * For example, for an $id of 'edit-post' the base is 'edit'.
</span><span class="cx"> *
</span><span class="cx"> * @since 3.3.0
</span><span class="lines">@@ -539,7 +539,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @since 3.3.0
</span><span class="cx"> *
</span><del>- * @param string $parent_file The parent file of the screen. Typically the $parent_file global.
</del><ins>+ * @param string $parent_file The parent file of the screen. Typically the $parent_file global.
</ins><span class="cx"> */
</span><span class="cx"> function set_parentage( $parent_file ) {
</span><span class="cx"> $this->parent_file = $parent_file;
</span><span class="lines">@@ -809,7 +809,7 @@
</span><span class="cx"> $welcome_checked = false;
</span><span class="cx"> }
</span><span class="cx"> echo '<label for="wp_welcome_panel-hide">';
</span><del>- echo '<input type="checkbox" id="wp_welcome_panel-hide"' . checked( (bool) $welcome_checked, true, false ) . ' />';
</del><ins>+ echo '<input type="checkbox" id="wp_welcome_panel-hide"' . checked( (bool) $welcome_checked, true, false ) . ' />';
</ins><span class="cx"> echo __( 'Welcome' ) . "</label>\n";
</span><span class="cx"> }
</span><span class="cx"> ?>
</span></span></pre></div>
<a id="trunkwpadminincludestaxonomyphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/taxonomy.php (19592 => 19593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/taxonomy.php 2011-12-12 22:25:58 UTC (rev 19592)
+++ trunk/wp-admin/includes/taxonomy.php 2011-12-13 23:45:31 UTC (rev 19593)
</span><span class="lines">@@ -86,7 +86,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @param mixed $catarr See defaults below. Set 'cat_ID' to a non-zero value to update an existing category. The 'taxonomy' key was added in 3.0.0.
</span><span class="cx"> * @param bool $wp_error Optional, since 2.5.0. Set this to true if the caller handles WP_Error return values.
</span><del>- * @return int|object The ID number of the new or updated Category on success. Zero or a WP_Error on failure, depending on param $wp_error.
</del><ins>+ * @return int|object The ID number of the new or updated Category on success. Zero or a WP_Error on failure, depending on param $wp_error.
</ins><span class="cx"> */
</span><span class="cx"> function wp_insert_category($catarr, $wp_error = false) {
</span><span class="cx"> $cat_defaults = array('cat_ID' => 0, 'taxonomy' => 'category', 'cat_name' => '', 'category_description' => '', 'category_nicename' => '', 'category_parent' => '');
</span><span class="lines">@@ -145,7 +145,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @since 2.0.0
</span><span class="cx"> *
</span><del>- * @param array $catarr The 'cat_ID' value is required. All other keys are optional.
</del><ins>+ * @param array $catarr The 'cat_ID' value is required. All other keys are optional.
</ins><span class="cx"> * @return int|bool The ID number of the new or updated Category on success. Zero or FALSE on failure.
</span><span class="cx"> */
</span><span class="cx"> function wp_update_category($catarr) {
</span></span></pre></div>
<a id="trunkwpadminincludesthemephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/theme.php (19592 => 19593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/theme.php 2011-12-12 22:25:58 UTC (rev 19592)
+++ trunk/wp-admin/includes/theme.php 2011-12-13 23:45:31 UTC (rev 19593)
</span><span class="lines">@@ -253,7 +253,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 update.") ) . '\') ) {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="trunkwpadminincludesupgradephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/upgrade.php (19592 => 19593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/upgrade.php 2011-12-12 22:25:58 UTC (rev 19592)
+++ trunk/wp-admin/includes/upgrade.php 2011-12-13 23:45:31 UTC (rev 19593)
</span><span class="lines">@@ -58,8 +58,8 @@
</span><span class="cx"> if ( ! $public )
</span><span class="cx"> update_option('default_pingback_flag', 0);
</span><span class="cx">
</span><del>- // Create default user. If the user already exists, the user tables are
- // being shared among blogs. Just set the role in that case.
</del><ins>+ // Create default user. If the user already exists, the user tables are
+ // being shared among blogs. Just set the role in that case.
</ins><span class="cx"> $user_id = username_exists($user_name);
</span><span class="cx"> $user_password = trim($user_password);
</span><span class="cx"> $email_password = false;
</span><span class="lines">@@ -358,7 +358,7 @@
</span><span class="cx">
</span><span class="cx"> $wp_current_db_version = __get_option('db_version');
</span><span class="cx">
</span><del>- // We are up-to-date. Nothing to do.
</del><ins>+ // We are up-to-date. Nothing to do.
</ins><span class="cx"> if ( $wp_db_version == $wp_current_db_version )
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -394,7 +394,7 @@
</span><span class="cx"> global $wp_current_db_version, $wp_db_version, $wp_rewrite;
</span><span class="cx"> $wp_current_db_version = __get_option('db_version');
</span><span class="cx">
</span><del>- // We are up-to-date. Nothing to do.
</del><ins>+ // We are up-to-date. Nothing to do.
</ins><span class="cx"> if ( $wp_db_version == $wp_current_db_version )
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -646,7 +646,7 @@
</span><span class="cx"> $active_plugins = __get_option('active_plugins');
</span><span class="cx">
</span><span class="cx"> // If plugins are not stored in an array, they're stored in the old
</span><del>- // newline separated format. Convert to new format.
</del><ins>+ // newline separated format. Convert to new format.
</ins><span class="cx"> if ( !is_array( $active_plugins ) ) {
</span><span class="cx"> $active_plugins = explode("\n", trim($active_plugins));
</span><span class="cx"> update_option('active_plugins', $active_plugins);
</span><span class="lines">@@ -898,9 +898,9 @@
</span><span class="cx"> $wpdb->insert( $wpdb->term_relationships, array('object_id' => $post_id, 'term_taxonomy_id' => $tt_id) );
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // < 3570 we used linkcategories. >= 3570 we used categories and link2cat.
</del><ins>+ // < 3570 we used linkcategories. >= 3570 we used categories and link2cat.
</ins><span class="cx"> if ( $wp_current_db_version < 3570 ) {
</span><del>- // Create link_category terms for link categories. Create a map of link cat IDs
</del><ins>+ // Create link_category terms for link categories. Create a map of link cat IDs
</ins><span class="cx"> // to link_category terms.
</span><span class="cx"> $link_cat_id_map = array();
</span><span class="cx"> $default_link_cat = 0;
</span><span class="lines">@@ -1690,7 +1690,7 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> // Copy files from the old locations to the site theme.
</span><del>- // TODO: This does not copy arbitrary include dependencies. Only the
</del><ins>+ // TODO: This does not copy arbitrary include dependencies. Only the
</ins><span class="cx"> // standard WP files are copied.
</span><span class="cx"> $files = array('index.php' => 'index.php', 'wp-layout.css' => 'style.css', 'wp-comments.php' => 'comments.php', 'wp-comments-popup.php' => 'comments-popup.php');
</span><span class="cx">
</span><span class="lines">@@ -1938,7 +1938,7 @@
</span><span class="cx">
</span><span class="cx"> // Upgrade versions prior to 2.9
</span><span class="cx"> if ( $wp_current_db_version < 11557 ) {
</span><del>- // Delete duplicate options. Keep the option with the highest option_id.
</del><ins>+ // Delete duplicate options. Keep the option with the highest option_id.
</ins><span class="cx"> $wpdb->query("DELETE o1 FROM $wpdb->options AS o1 JOIN $wpdb->options AS o2 USING (`option_name`) WHERE o2.option_id > o1.option_id");
</span><span class="cx">
</span><span class="cx"> // Drop the old primary key and add the new.
</span></span></pre></div>
<a id="trunkwpadmininstallphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/install.php (19592 => 19593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/install.php 2011-12-12 22:25:58 UTC (rev 19592)
+++ trunk/wp-admin/install.php 2011-12-13 23:45:31 UTC (rev 19593)
</span><span class="lines">@@ -207,7 +207,7 @@
</span><span class="cx"> $error = true;
</span><span class="cx"> } elseif ( ! is_email( $admin_email ) ) {
</span><span class="cx"> // TODO: poka-yoke
</span><del>- display_setup_form( __( 'that isn&#8217;t a valid e-mail address. E-mail addresses look like: <code>username@example.com</code>' ) );
</del><ins>+ display_setup_form( __( 'that isn&#8217;t a valid e-mail address. E-mail addresses look like: <code>username@example.com</code>' ) );
</ins><span class="cx"> $error = true;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminjscommondevjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/js/common.dev.js (19592 => 19593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/common.dev.js 2011-12-12 22:25:58 UTC (rev 19592)
+++ trunk/wp-admin/js/common.dev.js 2011-12-13 23:45:31 UTC (rev 19593)
</span><span class="lines">@@ -316,7 +316,7 @@
</span><span class="cx"> var el = e.target, selStart = el.selectionStart, selEnd = el.selectionEnd, val = el.value, scroll, sel;
</span><span class="cx">
</span><span class="cx"> try {
</span><del>- this.lastKey = 9; // not a standard DOM property, lastKey is to help stop Opera tab event. See blur handler below.
</del><ins>+ this.lastKey = 9; // not a standard DOM property, lastKey is to help stop Opera tab event. See blur handler below.
</ins><span class="cx"> } catch(err) {}
</span><span class="cx">
</span><span class="cx"> if ( document.selection ) {
</span></span></pre></div>
<a id="trunkwpadminmaintrepairphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/maint/repair.php (19592 => 19593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/maint/repair.php 2011-12-12 22:25:58 UTC (rev 19592)
+++ trunk/wp-admin/maint/repair.php 2011-12-13 23:45:31 UTC (rev 19593)
</span><span class="lines">@@ -19,7 +19,7 @@
</span><span class="cx"> <?php
</span><span class="cx">
</span><span class="cx"> if ( !defined('WP_ALLOW_REPAIR') ) {
</span><del>- echo '<p>'.__('To allow use of this page to automatically repair database problems, please add the following line to your wp-config.php file. Once this line is added to your config, reload this page.')."</p><code>define('WP_ALLOW_REPAIR', true);</code>";
</del><ins>+ echo '<p>'.__('To allow use of this page to automatically repair database problems, please add the following line to your wp-config.php file. Once this line is added to your config, reload this page.')."</p><code>define('WP_ALLOW_REPAIR', true);</code>";
</ins><span class="cx"> } elseif ( isset($_GET['repair']) ) {
</span><span class="cx"> check_admin_referer('repair_db');
</span><span class="cx">
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx"> printf( __( 'The %s table is okay.' ), $table );
</span><span class="cx"> } else {
</span><span class="cx"> /* translators: 1: table name, 2: error message, */
</span><del>- printf( __( 'The %1$s table is not okay. It is reporting the following error: %2$s. WordPress will attempt to repair this table&hellip;' ) , $table, "<code>$check->Msg_text</code>" );
</del><ins>+ printf( __( 'The %1$s table is not okay. It is reporting the following error: %2$s. WordPress will attempt to repair this table&hellip;' ) , $table, "<code>$check->Msg_text</code>" );
</ins><span class="cx">
</span><span class="cx"> $repair = $wpdb->get_row("REPAIR TABLE $table");
</span><span class="cx">
</span><span class="lines">@@ -95,16 +95,16 @@
</span><span class="cx"> $problem_output[] = "$table: $problem";
</span><span class="cx"> echo '<textarea name="errors" id="errors" rows="20" cols="60">' . esc_textarea( implode("\n", $problem_output) ) . '</textarea>';
</span><span class="cx"> } else {
</span><del>- echo '<p>'.__('Repairs complete. Please remove the following line from wp-config.php to prevent this page from being used by unauthorized users.')."</p><code>define('WP_ALLOW_REPAIR', true);</code>";
</del><ins>+ echo '<p>'.__('Repairs complete. Please remove the following line from wp-config.php to prevent this page from being used by unauthorized users.')."</p><code>define('WP_ALLOW_REPAIR', true);</code>";
</ins><span class="cx"> }
</span><span class="cx"> } else {
</span><span class="cx"> if ( isset($_GET['referrer']) && 'is_blog_installed' == $_GET['referrer'] )
</span><span class="cx"> _e('One or more database tables are unavailable. To allow WordPress to attempt to repair these tables, press the &#8220;Repair Database&#8221; button. Repairing can take a while, so please be patient.');
</span><span class="cx"> else
</span><del>- _e('WordPress can automatically look for some common database problems and repair them. Repairing can take a while, so please be patient.')
</del><ins>+ _e('WordPress can automatically look for some common database problems and repair them. Repairing can take a while, so please be patient.')
</ins><span class="cx"> ?>
</span><span class="cx"> <p class="step"><a class="button" href="<?php echo wp_nonce_url('repair.php?repair=1', 'repair_db') ?>"><?php _e( 'Repair Database' ); ?></a></p>
</span><del>- <?php _e('WordPress can also attempt to optimize the database. This improves performance in some situations. Repairing and optimizing the database can take a long time and the database will be locked while optimizing.'); ?>
</del><ins>+ <?php _e('WordPress can also attempt to optimize the database. This improves performance in some situations. Repairing and optimizing the database can take a long time and the database will be locked while optimizing.'); ?>
</ins><span class="cx"> <p class="step"><a class="button" href="<?php echo wp_nonce_url('repair.php?repair=2', 'repair_db') ?>"><?php _e( 'Repair and Optimize Database' ); ?></a></p>
</span><span class="cx"> <?php
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpadminnetworksettingsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/settings.php (19592 => 19593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/settings.php 2011-12-12 22:25:58 UTC (rev 19592)
+++ trunk/wp-admin/network/settings.php 2011-12-13 23:45:31 UTC (rev 19593)
</span><span class="lines">@@ -322,7 +322,7 @@
</span><span class="cx"> $menu_perms = get_site_option( 'menu_items' );
</span><span class="cx"> $menu_items = apply_filters( 'mu_menu_items', array( 'plugins' => __( 'Plugins' ) ) );
</span><span class="cx"> foreach ( (array) $menu_items as $key => $val ) {
</span><del>- echo "<label><input type='checkbox' name='menu_items[" . $key . "]' value='1'" . ( isset( $menu_perms[$key] ) ? checked( $menu_perms[$key], '1', false ) : '' ) . " /> " . esc_html( $val ) . "</label><br/>";
</del><ins>+ echo "<label><input type='checkbox' name='menu_items[" . $key . "]' value='1'" . ( isset( $menu_perms[$key] ) ? checked( $menu_perms[$key], '1', false ) : '' ) . " /> " . esc_html( $val ) . "</label><br/>";
</ins><span class="cx"> }
</span><span class="cx"> ?>
</span><span class="cx"> </td>
</span></span></pre></div>
<a id="trunkwpadminnetworksiteinfophp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/site-info.php (19592 => 19593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/site-info.php 2011-12-12 22:25:58 UTC (rev 19592)
+++ trunk/wp-admin/network/site-info.php 2011-12-13 23:45:31 UTC (rev 19593)
</span><span class="lines">@@ -108,7 +108,7 @@
</span><span class="cx"> );
</span><span class="cx"> foreach ( $tabs as $tab_id => $tab ) {
</span><span class="cx"> $class = ( $tab['url'] == $pagenow ) ? ' nav-tab-active' : '';
</span><del>- echo '<a href="' . $tab['url'] . '?id=' . $id .'" class="nav-tab' . $class . '">' . esc_html( $tab['label'] ) . '</a>';
</del><ins>+ echo '<a href="' . $tab['url'] . '?id=' . $id .'" class="nav-tab' . $class . '">' . esc_html( $tab['label'] ) . '</a>';
</ins><span class="cx"> }
</span><span class="cx"> ?>
</span><span class="cx"> </h3>
</span></span></pre></div>
<a id="trunkwpadminnetworksitesettingsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/site-settings.php (19592 => 19593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/site-settings.php 2011-12-12 22:25:58 UTC (rev 19592)
+++ trunk/wp-admin/network/site-settings.php 2011-12-13 23:45:31 UTC (rev 19593)
</span><span class="lines">@@ -98,7 +98,7 @@
</span><span class="cx"> );
</span><span class="cx"> foreach ( $tabs as $tab_id => $tab ) {
</span><span class="cx"> $class = ( $tab['url'] == $pagenow ) ? ' nav-tab-active' : '';
</span><del>- echo '<a href="' . $tab['url'] . '?id=' . $id .'" class="nav-tab' . $class . '">' . esc_html( $tab['label'] ) . '</a>';
</del><ins>+ echo '<a href="' . $tab['url'] . '?id=' . $id .'" class="nav-tab' . $class . '">' . esc_html( $tab['label'] ) . '</a>';
</ins><span class="cx"> }
</span><span class="cx"> ?>
</span><span class="cx"> </h3>
</span></span></pre></div>
<a id="trunkwpadminnetworksitethemesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/site-themes.php (19592 => 19593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/site-themes.php 2011-12-12 22:25:58 UTC (rev 19592)
+++ trunk/wp-admin/network/site-themes.php 2011-12-13 23:45:31 UTC (rev 19593)
</span><span class="lines">@@ -152,7 +152,7 @@
</span><span class="cx"> );
</span><span class="cx"> foreach ( $tabs as $tab_id => $tab ) {
</span><span class="cx"> $class = ( $tab['url'] == $pagenow ) ? ' nav-tab-active' : '';
</span><del>- echo '<a href="' . $tab['url'] . '?id=' . $id .'" class="nav-tab' . $class . '">' . esc_html( $tab['label'] ) . '</a>';
</del><ins>+ echo '<a href="' . $tab['url'] . '?id=' . $id .'" class="nav-tab' . $class . '">' . esc_html( $tab['label'] ) . '</a>';
</ins><span class="cx"> }
</span><span class="cx"> ?>
</span><span class="cx"> </h3><?php
</span></span></pre></div>
<a id="trunkwpadminnetworksiteusersphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/site-users.php (19592 => 19593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/site-users.php 2011-12-12 22:25:58 UTC (rev 19592)
+++ trunk/wp-admin/network/site-users.php 2011-12-13 23:45:31 UTC (rev 19593)
</span><span class="lines">@@ -186,7 +186,7 @@
</span><span class="cx"> );
</span><span class="cx"> foreach ( $tabs as $tab_id => $tab ) {
</span><span class="cx"> $class = ( $tab['url'] == $pagenow ) ? ' nav-tab-active' : '';
</span><del>- echo '<a href="' . $tab['url'] . '?id=' . $id .'" class="nav-tab' . $class . '">' . esc_html( $tab['label'] ) . '</a>';
</del><ins>+ echo '<a href="' . $tab['url'] . '?id=' . $id .'" class="nav-tab' . $class . '">' . esc_html( $tab['label'] ) . '</a>';
</ins><span class="cx"> }
</span><span class="cx"> ?>
</span><span class="cx"> </h3><?php
</span></span></pre></div>
<a id="trunkwpadminoptionsdiscussionphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/options-discussion.php (19592 => 19593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/options-discussion.php 2011-12-12 22:25:58 UTC (rev 19592)
+++ trunk/wp-admin/options-discussion.php 2011-12-13 23:45:31 UTC (rev 19593)
</span><span class="lines">@@ -164,7 +164,7 @@
</span><span class="cx">
</span><span class="cx"> <h3><?php _e('Avatars'); ?></h3>
</span><span class="cx">
</span><del>-<p><?php _e('An avatar is an image that follows you from weblog to weblog appearing beside your name when you comment on avatar enabled sites. Here you can enable the display of avatars for people who comment on your site.'); ?></p>
</del><ins>+<p><?php _e('An avatar is an image that follows you from weblog to weblog appearing beside your name when you comment on avatar enabled sites. Here you can enable the display of avatars for people who comment on your site.'); ?></p>
</ins><span class="cx">
</span><span class="cx"> <?php // the above would be a good place to link to codex documentation on the gravatar functions, for putting it in themes. anything like that? ?>
</span><span class="cx">
</span><span class="lines">@@ -228,7 +228,7 @@
</span><span class="cx"> $avatar_list = '';
</span><span class="cx"> foreach ( $avatar_defaults as $default_key => $default_name ) {
</span><span class="cx"> $selected = ($default == $default_key) ? 'checked="checked" ' : '';
</span><del>- $avatar_list .= "\n\t<label><input type='radio' name='avatar_default' id='avatar_{$default_key}' value='" . esc_attr($default_key) . "' {$selected}/> ";
</del><ins>+ $avatar_list .= "\n\t<label><input type='radio' name='avatar_default' id='avatar_{$default_key}' value='" . esc_attr($default_key) . "' {$selected}/> ";
</ins><span class="cx">
</span><span class="cx"> $avatar = get_avatar( $user_email, $size, $default_key );
</span><span class="cx"> $avatar_list .= preg_replace("/src='(.+?)'/", "src='\$1&amp;forcedefault=1'", $avatar);
</span></span></pre></div>
<a id="trunkwpadminoptionsgeneralphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/options-general.php (19592 => 19593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/options-general.php 2011-12-12 22:25:58 UTC (rev 19592)
+++ trunk/wp-admin/options-general.php 2011-12-13 23:45:31 UTC (rev 19593)
</span><span class="lines">@@ -151,7 +151,7 @@
</span><span class="cx">
</span><span class="cx"> $check_zone_info = true;
</span><span class="cx">
</span><del>-// Remove old Etc mappings. Fallback to gmt_offset.
</del><ins>+// Remove old Etc mappings. Fallback to gmt_offset.
</ins><span class="cx"> if ( false !== strpos($tzstring,'Etc/GMT') )
</span><span class="cx"> $tzstring = '';
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminoptionswritingphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/options-writing.php (19592 => 19593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/options-writing.php 2011-12-12 22:25:58 UTC (rev 19592)
+++ trunk/wp-admin/options-writing.php 2011-12-13 23:45:31 UTC (rev 19593)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> if ( is_multisite() ) {
</span><span class="cx"> $post_email_help = '<p>' . __('Due to security issues, you cannot use Post By Email on Multisite Installs.') . '</p>';
</span><span class="cx"> } else {
</span><del>- $post_email_help = '<p>' . __('Post via email settings allow you to send your WordPress install an email with the content of your post. You must set up a secret e-mail account with POP3 access to use this, and any mail received at this address will be posted, so it&#8217;s a good idea to keep this address very secret.') . '</p>';
</del><ins>+ $post_email_help = '<p>' . __('Post via email settings allow you to send your WordPress install an email with the content of your post. You must set up a secret e-mail account with POP3 access to use this, and any mail received at this address will be posted, so it&#8217;s a good idea to keep this address very secret.') . '</p>';
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> get_current_screen()->add_help_tab( array(
</span></span></pre></div>
<a id="trunkwpadminplugineditorphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/plugin-editor.php (19592 => 19593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/plugin-editor.php 2011-12-12 22:25:58 UTC (rev 19592)
+++ trunk/wp-admin/plugin-editor.php 2011-12-13 23:45:31 UTC (rev 19593)
</span><span class="lines">@@ -236,7 +236,7 @@
</span><span class="cx"> <?php endif; ?>
</span><span class="cx"> <?php if ( is_writeable($real_file) ) : ?>
</span><span class="cx"> <?php if ( in_array( $file, (array) get_option( 'active_plugins', array() ) ) ) { ?>
</span><del>- <p><?php _e('<strong>Warning:</strong> Making changes to active plugins is not recommended. If your changes cause a fatal error, the plugin will be automatically deactivated.'); ?></p>
</del><ins>+ <p><?php _e('<strong>Warning:</strong> Making changes to active plugins is not recommended. If your changes cause a fatal error, the plugin will be automatically deactivated.'); ?></p>
</ins><span class="cx"> <?php } ?>
</span><span class="cx"> <p class="submit">
</span><span class="cx"> <?php
</span></span></pre></div>
<a id="trunkwpadminpluginsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/plugins.php (19592 => 19593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/plugins.php 2011-12-12 22:25:58 UTC (rev 19592)
+++ trunk/wp-admin/plugins.php 2011-12-13 23:45:31 UTC (rev 19593)
</span><span class="lines">@@ -355,7 +355,7 @@
</span><span class="cx"> if ( isset( $_GET['main'] ) )
</span><span class="cx"> $errmsg = __( 'You cannot delete a plugin while it is active on the main site.' );
</span><span class="cx"> elseif ( isset($_GET['charsout']) )
</span><del>- $errmsg = sprintf(__('The plugin generated %d characters of <strong>unexpected output</strong> during activation. If you notice &#8220;headers already sent&#8221; messages, problems with syndication feeds or other issues, try deactivating or removing this plugin.'), $_GET['charsout']);
</del><ins>+ $errmsg = sprintf(__('The plugin generated %d characters of <strong>unexpected output</strong> during activation. If you notice &#8220;headers already sent&#8221; messages, problems with syndication feeds or other issues, try deactivating or removing this plugin.'), $_GET['charsout']);
</ins><span class="cx"> else
</span><span class="cx"> $errmsg = __('Plugin could not be activated because it triggered a <strong>fatal error</strong>.');
</span><span class="cx"> ?>
</span></span></pre></div>
<a id="trunkwpadminthemesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/themes.php (19592 => 19593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/themes.php 2011-12-12 22:25:58 UTC (rev 19592)
+++ trunk/wp-admin/themes.php 2011-12-13 23:45:31 UTC (rev 19593)
</span><span class="lines">@@ -76,7 +76,7 @@
</span><span class="cx"> ?>
</span><span class="cx">
</span><span class="cx"> <?php if ( ! validate_current_theme() ) : ?>
</span><del>-<div id="message1" class="updated"><p><?php _e('The active theme is broken. Reverting to the default theme.'); ?></p></div>
</del><ins>+<div id="message1" class="updated"><p><?php _e('The active theme is broken. Reverting to the default theme.'); ?></p></div>
</ins><span class="cx"> <?php elseif ( isset($_GET['activated']) ) :
</span><span class="cx"> if ( isset($wp_registered_sidebars) && count( (array) $wp_registered_sidebars ) && current_user_can('edit_theme_options') ) { ?>
</span><span class="cx"> <div id="message2" class="updated"><p><?php printf( __('New theme activated. This theme supports widgets, please visit the <a href="%s">widgets settings</a> screen to configure them.'), admin_url( 'widgets.php' ) ); ?></p></div><?php
</span></span></pre></div>
<a id="trunkwpadminupdatecorephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/update-core.php (19592 => 19593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/update-core.php 2011-12-12 22:25:58 UTC (rev 19592)
+++ trunk/wp-admin/update-core.php 2011-12-13 23:45:31 UTC (rev 19593)
</span><span class="lines">@@ -36,7 +36,7 @@
</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 update 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><span class="lines">@@ -317,7 +317,7 @@
</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($stylesheet) . "' /></th>
</span><del>- <td class='plugin-title'><img src='$screenshot' width='64' height='64' style='float:left; padding: 0 5px 5px' /><strong>{$theme_data->Name}</strong>" . sprintf(__('You have version %1$s installed. Update to %2$s.'), $theme_data->Version, $theme_data->update['new_version']) . "</td>
</del><ins>+ <td class='plugin-title'><img src='$screenshot' width='64' height='64' style='float:left; padding: 0 5px 5px' /><strong>{$theme_data->Name}</strong>" . sprintf(__('You have version %1$s installed. Update to %2$s.'), $theme_data->Version, $theme_data->update['new_version']) . "</td>
</ins><span class="cx"> </tr>";
</span><span class="cx"> }
</span><span class="cx"> ?>
</span></span></pre></div>
<a id="trunkwpadminupgradephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/upgrade.php (19592 => 19593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/upgrade.php 2011-12-12 22:25:58 UTC (rev 19592)
+++ trunk/wp-admin/upgrade.php 2011-12-13 23:45:31 UTC (rev 19593)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx"> else
</span><span class="cx"> $step = 0;
</span><span class="cx">
</span><del>-// Do it. No output.
</del><ins>+// Do it. No output.
</ins><span class="cx"> if ( 'upgrade_db' === $step ) {
</span><span class="cx"> wp_upgrade();
</span><span class="cx"> die( '0' );
</span></span></pre></div>
<a id="trunkwpadminusernewphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/user-new.php (19592 => 19593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/user-new.php 2011-12-12 22:25:58 UTC (rev 19592)
+++ trunk/wp-admin/user-new.php 2011-12-13 23:45:31 UTC (rev 19593)
</span><span class="lines">@@ -163,7 +163,7 @@
</span><span class="cx"> 'content' => '<p>' . __('Here is a basic overview of the different user roles and the permissions associated with each one:') . '</p>' .
</span><span class="cx"> '<ul>' .
</span><span class="cx"> '<li>' . __('Administrators have access to all the administration features.') . '</li>' .
</span><del>- '<li>' . __('Editors can publish posts, manage posts as well as manage other people&#8217;s posts, etc.') . '</li>' .
</del><ins>+ '<li>' . __('Editors can publish posts, manage posts as well as manage other people&#8217;s posts, etc.') . '</li>' .
</ins><span class="cx"> '<li>' . __('Authors can publish and manage their own posts, and are able to upload files.') . '</li>' .
</span><span class="cx"> '<li>' . __('Contributors can write and manage their posts but not publish posts or upload media files.') . '</li>' .
</span><span class="cx"> '<li>' . __('Subscribers can read comments/comment/receive newsletters, etc. but cannot create regular site content.') . '</li>' .
</span><span class="lines">@@ -251,10 +251,10 @@
</span><span class="cx"> if ( $do_both )
</span><span class="cx"> echo '<h3 id="add-existing-user">' . __('Add Existing User') . '</h3>';
</span><span class="cx"> if ( !is_super_admin() ) {
</span><del>- _e( 'Enter the email address of an existing user on this network to invite them to this site. That person will be sent an email asking them to confirm the invite.' );
</del><ins>+ _e( 'Enter the email address of an existing user on this network to invite them to this site. That person will be sent an email asking them to confirm the invite.' );
</ins><span class="cx"> $label = __('E-mail');
</span><span class="cx"> } else {
</span><del>- _e( 'Enter the email address or username of an existing user on this network to invite them to this site. That person will be sent an email asking them to confirm the invite.' );
</del><ins>+ _e( 'Enter the email address or username of an existing user on this network to invite them to this site. That person will be sent an email asking them to confirm the invite.' );
</ins><span class="cx"> $label = __('E-mail or Username');
</span><span class="cx"> }
</span><span class="cx"> ?>
</span></span></pre></div>
<a id="trunkwpadminusersphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/users.php (19592 => 19593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/users.php 2011-12-12 22:25:58 UTC (rev 19592)
+++ trunk/wp-admin/users.php 2011-12-13 23:45:31 UTC (rev 19593)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> 'content' => '<p>' . __('You can customize the display of this screen in a number of ways:') . '</p>' .
</span><span class="cx"> '<ul>' .
</span><span class="cx"> '<li>' . __('You can hide/display columns based on your needs and decide how many users to list per screen using the Screen Options tab.') . '</li>' .
</span><del>- '<li>' . __('You can filter the list of users by User Role using the text links in the upper left to show All, Administrator, Editor, Author, Contributor, or Subscriber. The default view is to show all users. Unused User Roles are not listed.') . '</li>' .
</del><ins>+ '<li>' . __('You can filter the list of users by User Role using the text links in the upper left to show All, Administrator, Editor, Author, Contributor, or Subscriber. The default view is to show all users. Unused User Roles are not listed.') . '</li>' .
</ins><span class="cx"> '<li>' . __('You can view all posts made by a user by clicking on the number under the Posts column.') . '</li>' .
</span><span class="cx"> '</ul>'
</span><span class="cx"> ) );
</span></span></pre></div>
<a id="trunkwpappphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-app.php (19592 => 19593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-app.php 2011-12-12 22:25:58 UTC (rev 19592)
+++ trunk/wp-app.php 2011-12-13 23:45:31 UTC (rev 19593)
</span><span class="lines">@@ -285,7 +285,7 @@
</span><span class="cx">
</span><span class="cx"> // check to see if AtomPub is enabled
</span><span class="cx"> if ( !get_option( 'enable_app' ) )
</span><del>- $this->forbidden( sprintf( __( 'AtomPub services are disabled on this site. An admin user can enable them at %s' ), admin_url('options-writing.php') ) );
</del><ins>+ $this->forbidden( sprintf( __( 'AtomPub services are disabled on this site. An admin user can enable them at %s' ), admin_url('options-writing.php') ) );
</ins><span class="cx">
</span><span class="cx"> // dispatch
</span><span class="cx"> foreach ( $this->selectors as $regex => $funcs ) {
</span><span class="lines">@@ -370,7 +370,7 @@
</span><span class="cx"> $categories = "";
</span><span class="cx"> $cats = get_categories(array('hierarchical' => 0, 'hide_empty' => 0));
</span><span class="cx"> foreach ( (array) $cats as $cat ) {
</span><del>- $categories .= " <category term=\"" . esc_attr($cat->name) . "\" />\n";
</del><ins>+ $categories .= " <category term=\"" . esc_attr($cat->name) . "\" />\n";
</ins><span class="cx"> }
</span><span class="cx"> $output = <<<EOD
</span><span class="cx"> <app:categories xmlns:app="$this->ATOMPUB_NS"
</span></span></pre></div>
<a id="trunkwpincludesadminbarphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/admin-bar.php (19592 => 19593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/admin-bar.php 2011-12-12 22:25:58 UTC (rev 19592)
+++ trunk/wp-includes/admin-bar.php 2011-12-13 23:45:31 UTC (rev 19593)
</span><span class="lines">@@ -680,7 +680,7 @@
</span><span class="cx"> /**
</span><span class="cx"> * Set the display status of the admin bar.
</span><span class="cx"> *
</span><del>- * This can be called immediately upon plugin load. It does not need to be called from a function hooked to the init action.
</del><ins>+ * This can be called immediately upon plugin load. It does not need to be called from a function hooked to the init action.
</ins><span class="cx"> *
</span><span class="cx"> * @since 3.1.0
</span><span class="cx"> *
</span></span></pre></div>
<a id="trunkwpincludescachephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/cache.php (19592 => 19593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/cache.php 2011-12-12 22:25:58 UTC (rev 19592)
+++ trunk/wp-includes/cache.php 2011-12-13 23:45:31 UTC (rev 19593)
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx"> * @see WP_Object_Cache::decr()
</span><span class="cx"> *
</span><span class="cx"> * @param int|string $key The cache key to increment
</span><del>- * @param int $offset The amount by which to decrement the item's value. Default is 1.
</del><ins>+ * @param int $offset The amount by which to decrement the item's value. Default is 1.
</ins><span class="cx"> * @param string $group The group the key is in.
</span><span class="cx"> * @return false|int False on failure, the item's new value on success.
</span><span class="cx"> */
</span><span class="lines">@@ -120,7 +120,7 @@
</span><span class="cx"> * @see WP_Object_Cache::incr()
</span><span class="cx"> *
</span><span class="cx"> * @param int|string $key The cache key to increment
</span><del>- * @param int $offset The amount by which to increment the item's value. Default is 1.
</del><ins>+ * @param int $offset The amount by which to increment the item's value. Default is 1.
</ins><span class="cx"> * @param string $group The group the key is in.
</span><span class="cx"> * @return false|int False on failure, the item's new value on success.
</span><span class="cx"> */
</span><span class="lines">@@ -204,7 +204,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Reset internal cache keys and structures. If the cache backend uses global blog or site IDs as part of its cache keys,
</del><ins>+ * Reset internal cache keys and structures. If the cache backend uses global blog or site IDs as part of its cache keys,
</ins><span class="cx"> * this function instructs the backend to reset those keys and perform any cleanup since blog or site IDs have changed since cache init.
</span><span class="cx"> *
</span><span class="cx"> * @since 2.6.0
</span><span class="lines">@@ -317,7 +317,7 @@
</span><span class="cx"> * @since 3.3.0
</span><span class="cx"> *
</span><span class="cx"> * @param int|string $key The cache key to increment
</span><del>- * @param int $offset The amount by which to decrement the item's value. Default is 1.
</del><ins>+ * @param int $offset The amount by which to decrement the item's value. Default is 1.
</ins><span class="cx"> * @param string $group The group the key is in.
</span><span class="cx"> * @return false|int False on failure, the item's new value on success.
</span><span class="cx"> */
</span><span class="lines">@@ -416,7 +416,7 @@
</span><span class="cx"> * @since 3.3.0
</span><span class="cx"> *
</span><span class="cx"> * @param int|string $key The cache key to increment
</span><del>- * @param int $offset The amount by which to increment the item's value. Default is 1.
</del><ins>+ * @param int $offset The amount by which to increment the item's value. Default is 1.
</ins><span class="cx"> * @param string $group The group the key is in.
</span><span class="cx"> * @return false|int False on failure, the item's new value on success.
</span><span class="cx"> */
</span></span></pre></div>
<a id="trunkwpincludescapabilitiesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/capabilities.php (19592 => 19593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/capabilities.php 2011-12-12 22:25:58 UTC (rev 19592)
+++ trunk/wp-includes/capabilities.php 2011-12-13 23:45:31 UTC (rev 19593)
</span><span class="lines">@@ -1208,7 +1208,7 @@
</span><span class="cx"> // Create new object to avoid stomping the global current_user.
</span><span class="cx"> $user = new WP_User( $current_user->ID) ;
</span><span class="cx">
</span><del>- // Set the blog id. @todo add blog id arg to WP_User constructor?
</del><ins>+ // Set the blog id. @todo add blog id arg to WP_User constructor?
</ins><span class="cx"> $user->for_blog( $blog_id );
</span><span class="cx">
</span><span class="cx"> $args = array_slice( func_get_args(), 2 );
</span></span></pre></div>
<a id="trunkwpincludesclasshttpphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class-http.php (19592 => 19593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-http.php 2011-12-12 22:25:58 UTC (rev 19592)
+++ trunk/wp-includes/class-http.php 2011-12-13 23:45:31 UTC (rev 19593)
</span><span class="lines">@@ -201,7 +201,7 @@
</span><span class="cx"> * @param array $args Request arguments
</span><span class="cx"> * @param string $url URL to Request
</span><span class="cx"> *
</span><del>- * @return string|false Class name for the first transport that claims to support the request. False if no transport claims to support the request.
</del><ins>+ * @return string|false Class name for the first transport that claims to support the request. False if no transport claims to support the request.
</ins><span class="cx"> */
</span><span class="cx"> public function _get_first_available_transport( $args, $url = null ) {
</span><span class="cx"> $request_order = array( 'curl', 'streams', 'fsockopen' );
</span><span class="lines">@@ -1031,7 +1031,7 @@
</span><span class="cx"> $ssl_verify = apply_filters('https_ssl_verify', $ssl_verify);
</span><span class="cx">
</span><span class="cx">
</span><del>- // CURLOPT_TIMEOUT and CURLOPT_CONNECTTIMEOUT expect integers. Have to use ceil since
</del><ins>+ // CURLOPT_TIMEOUT and CURLOPT_CONNECTTIMEOUT expect integers. Have to use ceil since
</ins><span class="cx"> // a value of 0 will allow an unlimited timeout.
</span><span class="cx"> $timeout = (int) ceil( $r['timeout'] );
</span><span class="cx"> curl_setopt( $handle, CURLOPT_CONNECTTIMEOUT, $timeout );
</span></span></pre></div>
<a id="trunkwpincludesclasswpxmlrpcserverphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class-wp-xmlrpc-server.php (19592 => 19593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-wp-xmlrpc-server.php 2011-12-12 22:25:58 UTC (rev 19592)
+++ trunk/wp-includes/class-wp-xmlrpc-server.php 2011-12-13 23:45:31 UTC (rev 19593)
</span><span class="lines">@@ -156,7 +156,7 @@
</span><span class="cx"> */
</span><span class="cx"> function login_pass_ok($user_login, $user_pass) {
</span><span class="cx"> if ( !get_option( 'enable_xmlrpc' ) ) {
</span><del>- $this->error = new IXR_Error( 405, sprintf( __( 'XML-RPC services are disabled on this site. An admin user can enable them at %s'), admin_url('options-writing.php') ) );
</del><ins>+ $this->error = new IXR_Error( 405, sprintf( __( 'XML-RPC services are disabled on this site. An admin user can enable them at %s'), admin_url('options-writing.php') ) );
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -178,7 +178,7 @@
</span><span class="cx"> */
</span><span class="cx"> function login($username, $password) {
</span><span class="cx"> if ( !get_option( 'enable_xmlrpc' ) ) {
</span><del>- $this->error = new IXR_Error( 405, sprintf( __( 'XML-RPC services are disabled on this site. An admin user can enable them at %s'), admin_url('options-writing.php') ) );
</del><ins>+ $this->error = new IXR_Error( 405, sprintf( __( 'XML-RPC services are disabled on this site. An admin user can enable them at %s'), admin_url('options-writing.php') ) );
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1945,7 +1945,7 @@
</span><span class="cx"> fclose($f);
</span><span class="cx">
</span><span class="cx"> /* so it is actually editable with a windows/mac client */
</span><del>- // FIXME: (or delete me) do we really want to cater to bad clients at the expense of good ones by BEEPing up their line breaks? commented. $content = str_replace("\n", "\r\n", $content);
</del><ins>+ // FIXME: (or delete me) do we really want to cater to bad clients at the expense of good ones by BEEPing up their line breaks? commented. $content = str_replace("\n", "\r\n", $content);
</ins><span class="cx">
</span><span class="cx"> return $content;
</span><span class="cx"> }
</span><span class="lines">@@ -2544,7 +2544,7 @@
</span><span class="cx"> $postdata = wp_get_single_post($post_ID, ARRAY_A);
</span><span class="cx">
</span><span class="cx"> // If there is no post data for the give post id, stop
</span><del>- // now and return an error. Other wise a new post will be
</del><ins>+ // now and return an error. Other wise a new post will be
</ins><span class="cx"> // created (which was the old behavior).
</span><span class="cx"> if ( empty($postdata["ID"]) )
</span><span class="cx"> return(new IXR_Error(404, __('Invalid post ID.')));
</span></span></pre></div>
<a id="trunkwpincludesclasswpphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class-wp.php (19592 => 19593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-wp.php 2011-12-12 22:25:58 UTC (rev 19592)
+++ trunk/wp-includes/class-wp.php 2011-12-13 23:45:31 UTC (rev 19593)
</span><span class="lines">@@ -156,8 +156,8 @@
</span><span class="cx"> $home_path = trim($home_path, '/');
</span><span class="cx">
</span><span class="cx"> // Trim path info from the end and the leading home path from the
</span><del>- // front. For path info requests, this leaves us with the requesting
- // filename, if any. For 404 requests, this leaves us with the
</del><ins>+ // front. For path info requests, this leaves us with the requesting
+ // filename, if any. For 404 requests, this leaves us with the
</ins><span class="cx"> // requested permalink.
</span><span class="cx"> $req_uri = str_replace($pathinfo, '', $req_uri);
</span><span class="cx"> $req_uri = trim($req_uri, '/');
</span><span class="lines">@@ -401,7 +401,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // query_string filter deprecated. Use request filter instead.
</del><ins>+ // query_string filter deprecated. Use request filter instead.
</ins><span class="cx"> if ( has_filter('query_string') ) { // Don't bother filtering and parsing if no plugins are hooked in.
</span><span class="cx"> $this->query_string = apply_filters('query_string', $this->query_string);
</span><span class="cx"> parse_str($this->query_string, $this->query_vars);
</span></span></pre></div>
<a id="trunkwpincludesclasswpdependenciesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class.wp-dependencies.php (19592 => 19593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class.wp-dependencies.php 2011-12-12 22:25:58 UTC (rev 19592)
+++ trunk/wp-includes/class.wp-dependencies.php 2011-12-13 23:45:31 UTC (rev 19593)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx"> /**
</span><span class="cx"> * Do the dependencies
</span><span class="cx"> *
</span><del>- * Process the items passed to it or the queue. Processes all dependencies.
</del><ins>+ * Process the items passed to it or the queue. Processes all dependencies.
</ins><span class="cx"> *
</span><span class="cx"> * @param mixed $handles (optional) items to be processed. (void) processes queue, (string) process that item, (array of strings) process those items
</span><span class="cx"> * @return array Items that have been processed
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx"> /**
</span><span class="cx"> * Determines dependencies
</span><span class="cx"> *
</span><del>- * Recursively builds array of items to process taking dependencies into account. Does NOT catch infinite loops.
</del><ins>+ * Recursively builds array of items to process taking dependencies into account. Does NOT catch infinite loops.
</ins><span class="cx"> *
</span><span class="cx"> *
</span><span class="cx"> * @param mixed $handles Accepts (string) dep name or (array of strings) dep names
</span><span class="lines">@@ -90,7 +90,7 @@
</span><span class="cx"> if ( !isset($this->registered[$handle]) )
</span><span class="cx"> $keep_going = false; // Script doesn't exist
</span><span class="cx"> elseif ( $this->registered[$handle]->deps && array_diff($this->registered[$handle]->deps, array_keys($this->registered)) )
</span><del>- $keep_going = false; // Script requires deps which don't exist (not a necessary check. efficiency?)
</del><ins>+ $keep_going = false; // Script requires deps which don't exist (not a necessary check. efficiency?)
</ins><span class="cx"> elseif ( $this->registered[$handle]->deps && !$this->all_deps( $this->registered[$handle]->deps, true, $group ) )
</span><span class="cx"> $keep_going = false; // Script requires deps which don't exist
</span><span class="cx">
</span><span class="lines">@@ -98,7 +98,7 @@
</span><span class="cx"> if ( $recursion )
</span><span class="cx"> return false; // Abort this branch.
</span><span class="cx"> else
</span><del>- continue; // We're at the top level. Move on to the next one.
</del><ins>+ continue; // We're at the top level. Move on to the next one.
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( $queued ) // Already grobbed it and its deps
</span></span></pre></div>
<a id="trunkwpincludesclasswpscriptsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class.wp-scripts.php (19592 => 19593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class.wp-scripts.php 2011-12-12 22:25:58 UTC (rev 19592)
+++ trunk/wp-includes/class.wp-scripts.php 2011-12-13 23:45:31 UTC (rev 19593)
</span><span class="lines">@@ -37,9 +37,9 @@
</span><span class="cx"> /**
</span><span class="cx"> * Prints scripts
</span><span class="cx"> *
</span><del>- * Prints the scripts passed to it or the print queue. Also prints all necessary dependencies.
</del><ins>+ * Prints the scripts passed to it or the print queue. Also prints all necessary dependencies.
</ins><span class="cx"> *
</span><del>- * @param mixed $handles (optional) Scripts to be printed. (void) prints queue, (string) prints that script, (array of strings) prints those scripts.
</del><ins>+ * @param mixed $handles (optional) Scripts to be printed. (void) prints queue, (string) prints that script, (array of strings) prints those scripts.
</ins><span class="cx"> * @param int $group (optional) If scripts were queued in groups prints this group number.
</span><span class="cx"> * @return array Scripts that have been printed
</span><span class="cx"> */
</span></span></pre></div>
<a id="trunkwpincludescommenttemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/comment-template.php (19592 => 19593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/comment-template.php 2011-12-12 22:25:58 UTC (rev 19592)
+++ trunk/wp-includes/comment-template.php 2011-12-13 23:45:31 UTC (rev 19593)
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx"> * @uses apply_filters() Calls the 'get_comment_author_email' hook on the comment author email
</span><span class="cx"> * @uses $comment
</span><span class="cx"> *
</span><del>- * @param int $comment_ID The ID of the comment for which to get the author's email. Optional.
</del><ins>+ * @param int $comment_ID The ID of the comment for which to get the author's email. Optional.
</ins><span class="cx"> * @return string The current comment author's email
</span><span class="cx"> */
</span><span class="cx"> function get_comment_author_email( $comment_ID = 0 ) {
</span><span class="lines">@@ -141,7 +141,7 @@
</span><span class="cx"> * @since 1.5.0
</span><span class="cx"> * @uses apply_filters() Calls 'get_comment_author_link' hook on the complete link HTML or author
</span><span class="cx"> *
</span><del>- * @param int $comment_ID The ID of the comment for which to get the author's link. Optional.
</del><ins>+ * @param int $comment_ID The ID of the comment for which to get the author's link. Optional.
</ins><span class="cx"> * @return string Comment Author name or HTML link for author's URL
</span><span class="cx"> */
</span><span class="cx"> function get_comment_author_link( $comment_ID = 0 ) {
</span><span class="lines">@@ -189,7 +189,7 @@
</span><span class="cx"> * @since 0.71
</span><span class="cx"> * @see get_comment_author_IP() Echoes Result
</span><span class="cx"> *
</span><del>- * @param int $comment_ID The ID of the comment for which to print the author's IP address. Optional.
</del><ins>+ * @param int $comment_ID The ID of the comment for which to print the author's IP address. Optional.
</ins><span class="cx"> */
</span><span class="cx"> function comment_author_IP( $comment_ID = 0 ) {
</span><span class="cx"> echo get_comment_author_IP( $comment_ID );
</span><span class="lines">@@ -201,7 +201,7 @@
</span><span class="cx"> * @since 1.5.0
</span><span class="cx"> * @uses apply_filters() Calls 'get_comment_author_url' hook on the comment author's URL
</span><span class="cx"> *
</span><del>- * @param int $comment_ID The ID of the comment for which to get the author's URL. Optional.
</del><ins>+ * @param int $comment_ID The ID of the comment for which to get the author's URL. Optional.
</ins><span class="cx"> * @return string
</span><span class="cx"> */
</span><span class="cx"> function get_comment_author_url( $comment_ID = 0 ) {
</span><span class="lines">@@ -384,7 +384,7 @@
</span><span class="cx"> * @since 0.71
</span><span class="cx"> *
</span><span class="cx"> * @param string $d The format of the date (defaults to user's config)
</span><del>- * @param int $comment_ID The ID of the comment for which to print the date. Optional.
</del><ins>+ * @param int $comment_ID The ID of the comment for which to print the date. Optional.
</ins><span class="cx"> */
</span><span class="cx"> function comment_date( $d = '', $comment_ID = 0 ) {
</span><span class="cx"> echo get_comment_date( $d, $comment_ID );
</span><span class="lines">@@ -912,7 +912,7 @@
</span><span class="cx"> if ( file_exists( $include ) )
</span><span class="cx"> require( $include );
</span><span class="cx"> elseif ( file_exists( TEMPLATEPATH . $file ) )
</span><del>- require( TEMPLATEPATH . $file );
</del><ins>+ require( TEMPLATEPATH . $file );
</ins><span class="cx"> else // Backward compat code will be removed in a future release
</span><span class="cx"> require( ABSPATH . WPINC . '/theme-compat/comments.php');
</span><span class="cx"> }
</span><span class="lines">@@ -1091,7 +1091,7 @@
</span><span class="cx"> * @since 2.7.0
</span><span class="cx"> *
</span><span class="cx"> * @param array $args Optional. Override default options.
</span><del>- * @param int|object $post Optional. Post that the comment is going to be displayed on. Defaults to current post.
</del><ins>+ * @param int|object $post Optional. Post that the comment is going to be displayed on. Defaults to current post.
</ins><span class="cx"> * @return string|bool|null Link to show comment form, if successful. False, if comments are closed.
</span><span class="cx"> */
</span><span class="cx"> function get_post_reply_link($args = array(), $post = null) {
</span><span class="lines">@@ -1408,7 +1408,7 @@
</span><span class="cx"> * @uses Walker_Comment
</span><span class="cx"> *
</span><span class="cx"> * @param string|array $args Formatting options
</span><del>- * @param array $comments Optional array of comment objects. Defaults to $wp_query->comments
</del><ins>+ * @param array $comments Optional array of comment objects. Defaults to $wp_query->comments
</ins><span class="cx"> */
</span><span class="cx"> function wp_list_comments($args = array(), $comments = null ) {
</span><span class="cx"> global $wp_query, $comment_alt, $comment_depth, $comment_thread_alt, $overridden_cpage, $in_comment_loop;
</span><span class="lines">@@ -1534,7 +1534,7 @@
</span><span class="cx"> $defaults = array(
</span><span class="cx"> 'fields' => apply_filters( 'comment_form_default_fields', $fields ),
</span><span class="cx"> 'comment_field' => '<p class="comment-form-comment"><label for="comment">' . _x( 'Comment', 'noun' ) . '</label><textarea id="comment" name="comment" cols="45" rows="8" aria-required="true"></textarea></p>',
</span><del>- 'must_log_in' => '<p class="must-log-in">' . sprintf( __( 'You must be <a href="%s">logged in</a> to post a comment.' ), wp_login_url( apply_filters( 'the_permalink', get_permalink( $post_id ) ) ) ) . '</p>',
</del><ins>+ 'must_log_in' => '<p class="must-log-in">' . sprintf( __( 'You must be <a href="%s">logged in</a> to post a comment.' ), wp_login_url( apply_filters( 'the_permalink', get_permalink( $post_id ) ) ) ) . '</p>',
</ins><span class="cx"> 'logged_in_as' => '<p class="logged-in-as">' . sprintf( __( 'Logged in as <a href="%1$s">%2$s</a>. <a href="%3$s" title="Log out of this account">Log out?</a>' ), admin_url( 'profile.php' ), $user_identity, wp_logout_url( apply_filters( 'the_permalink', get_permalink( $post_id ) ) ) ) . '</p>',
</span><span class="cx"> 'comment_notes_before' => '<p class="comment-notes">' . __( 'Your email address will not be published.' ) . ( $req ? $required_text : '' ) . '</p>',
</span><span class="cx"> 'comment_notes_after' => '<p class="form-allowed-tags">' . sprintf( __( 'You may use these <abbr title="HyperText Markup Language">HTML</abbr> tags and attributes: %s' ), ' <code>' . allowed_tags() . '</code>' ) . '</p>',
</span></span></pre></div>
<a id="trunkwpincludescommentphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/comment.php (19592 => 19593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/comment.php 2011-12-12 22:25:58 UTC (rev 19592)
+++ trunk/wp-includes/comment.php 2011-12-13 23:45:31 UTC (rev 19593)
</span><span class="lines">@@ -685,9 +685,9 @@
</span><span class="cx"> do_action('comment_flood_trigger', $time_lastcomment, $time_newcomment);
</span><span class="cx">
</span><span class="cx"> if ( defined('DOING_AJAX') )
</span><del>- die( __('You are posting comments too quickly. Slow down.') );
</del><ins>+ die( __('You are posting comments too quickly. Slow down.') );
</ins><span class="cx">
</span><del>- wp_die( __('You are posting comments too quickly. Slow down.'), '', array('response' => 403) );
</del><ins>+ wp_die( __('You are posting comments too quickly. Slow down.'), '', array('response' => 403) );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -723,7 +723,7 @@
</span><span class="cx"> * @uses get_option() Used to fill in defaults for parameters.
</span><span class="cx"> * @uses Walker_Comment
</span><span class="cx"> *
</span><del>- * @param array $comments Optional array of comment objects. Defaults to $wp_query->comments
</del><ins>+ * @param array $comments Optional array of comment objects. Defaults to $wp_query->comments
</ins><span class="cx"> * @param int $per_page Optional comments per page.
</span><span class="cx"> * @param boolean $threaded Optional control over flat or threaded comments.
</span><span class="cx"> * @return int Number of comment pages.
</span><span class="lines">@@ -1947,7 +1947,7 @@
</span><span class="cx"> //
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Close comments on old posts on the fly, without any extra DB queries. Hooked to the_posts.
</del><ins>+ * Close comments on old posts on the fly, without any extra DB queries. Hooked to the_posts.
</ins><span class="cx"> *
</span><span class="cx"> * @access private
</span><span class="cx"> * @since 2.7.0
</span><span class="lines">@@ -1977,7 +1977,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Close comments on an old post. Hooked to comments_open and pings_open.
</del><ins>+ * Close comments on an old post. Hooked to comments_open and pings_open.
</ins><span class="cx"> *
</span><span class="cx"> * @access private
</span><span class="cx"> * @since 2.7.0
</span></span></pre></div>
<a id="trunkwpincludescronphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/cron.php (19592 => 19593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/cron.php 2011-12-12 22:25:58 UTC (rev 19592)
+++ trunk/wp-includes/cron.php 2011-12-13 23:45:31 UTC (rev 19593)
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx"> * specific interval, specified by you. The action will trigger when someone
</span><span class="cx"> * visits your WordPress site, if the scheduled time has passed.
</span><span class="cx"> *
</span><del>- * Valid values for the recurrence are hourly, daily and twicedaily. These can
</del><ins>+ * Valid values for the recurrence are hourly, daily and twicedaily. These can
</ins><span class="cx"> * be extended using the cron_schedules filter in wp_get_schedules().
</span><span class="cx"> *
</span><span class="cx"> * Use wp_next_scheduled() to prevent duplicates
</span></span></pre></div>
<a id="trunkwpincludesdefaultconstantsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/default-constants.php (19592 => 19593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/default-constants.php 2011-12-12 22:25:58 UTC (rev 19592)
+++ trunk/wp-includes/default-constants.php 2011-12-13 23:45:31 UTC (rev 19593)
</span><span class="lines">@@ -105,7 +105,7 @@
</span><span class="cx"> * @deprecated
</span><span class="cx"> */
</span><span class="cx"> if ( !defined('PLUGINDIR') )
</span><del>- define( 'PLUGINDIR', 'wp-content/plugins' ); // Relative to ABSPATH. For back compat.
</del><ins>+ define( 'PLUGINDIR', 'wp-content/plugins' ); // Relative to ABSPATH. For back compat.
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Allows for the mu-plugins directory to be moved from the default location.
</span><span class="lines">@@ -130,7 +130,7 @@
</span><span class="cx"> * @deprecated
</span><span class="cx"> */
</span><span class="cx"> if ( !defined( 'MUPLUGINDIR' ) )
</span><del>- define( 'MUPLUGINDIR', 'wp-content/mu-plugins' ); // Relative to ABSPATH. For back compat.
</del><ins>+ define( 'MUPLUGINDIR', 'wp-content/mu-plugins' ); // Relative to ABSPATH. For back compat.
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre></div>
<a id="trunkwpincludesformattingphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/formatting.php (19592 => 19593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/formatting.php 2011-12-12 22:25:58 UTC (rev 19592)
+++ trunk/wp-includes/formatting.php 2011-12-13 23:45:31 UTC (rev 19593)
</span><span class="lines">@@ -732,7 +732,7 @@
</span><span class="cx"> $extension = array_pop($parts);
</span><span class="cx"> $mimes = get_allowed_mime_types();
</span><span class="cx">
</span><del>- // Loop over any intermediate extensions. Munge them with a trailing underscore if they are a 2 - 5 character
</del><ins>+ // Loop over any intermediate extensions. Munge them with a trailing underscore if they are a 2 - 5 character
</ins><span class="cx"> // long alpha string not in the extension whitelist.
</span><span class="cx"> foreach ( (array) $parts as $part) {
</span><span class="cx"> $filename .= '.' . $part;
</span></span></pre></div>
<a id="trunkwpincludesfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/functions.php (19592 => 19593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/functions.php 2011-12-12 22:25:58 UTC (rev 19592)
+++ trunk/wp-includes/functions.php 2011-12-13 23:45:31 UTC (rev 19593)
</span><span class="lines">@@ -1905,7 +1905,7 @@
</span><span class="cx">
</span><span class="cx"> $suppress = $wpdb->suppress_errors();
</span><span class="cx">
</span><del>- // Loop over the WP tables. If none exist, then scratch install is allowed.
</del><ins>+ // Loop over the WP tables. If none exist, then scratch install is allowed.
</ins><span class="cx"> // If one or more exist, suggest table repair since we got here because the options
</span><span class="cx"> // table could not be accessed.
</span><span class="cx"> $wp_tables = $wpdb->tables();
</span><span class="lines">@@ -1922,7 +1922,7 @@
</span><span class="cx"> // One or more tables exist. We are insane.
</span><span class="cx">
</span><span class="cx"> // Die with a DB error.
</span><del>- $wpdb->error = sprintf( /*WP_I18N_NO_TABLES*/'One or more database tables are unavailable. The database may need to be <a href="%s">repaired</a>.'/*/WP_I18N_NO_TABLES*/, 'maint/repair.php?referrer=is_blog_installed' );
</del><ins>+ $wpdb->error = sprintf( /*WP_I18N_NO_TABLES*/'One or more database tables are unavailable. The database may need to be <a href="%s">repaired</a>.'/*/WP_I18N_NO_TABLES*/, 'maint/repair.php?referrer=is_blog_installed' );
</ins><span class="cx"> dead_db();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -3785,8 +3785,8 @@
</span><span class="cx"> /**
</span><span class="cx"> * Suspend cache invalidation.
</span><span class="cx"> *
</span><del>- * Turns cache invalidation on and off. Useful during imports where you don't wont to do invalidations
- * every time a post is inserted. Callers must be sure that what they are doing won't lead to an inconsistent
</del><ins>+ * Turns cache invalidation on and off. Useful during imports where you don't wont to do invalidations
+ * every time a post is inserted. Callers must be sure that what they are doing won't lead to an inconsistent
</ins><span class="cx"> * cache when invalidation is suspended.
</span><span class="cx"> *
</span><span class="cx"> * @since 2.7.0
</span></span></pre></div>
<a id="trunkwpincludesgeneraltemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/general-template.php (19592 => 19593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/general-template.php 2011-12-12 22:25:58 UTC (rev 19592)
+++ trunk/wp-includes/general-template.php 2011-12-13 23:45:31 UTC (rev 19593)
</span><span class="lines">@@ -2080,7 +2080,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @param string $file Optional. Style handle name or file name (without ".css" extension) relative
</span><span class="cx"> * to wp-admin/. Defaults to 'wp-admin'.
</span><del>- * @param bool $force_echo Optional. Force the stylesheet link to be printed rather than enqueued.
</del><ins>+ * @param bool $force_echo Optional. Force the stylesheet link to be printed rather than enqueued.
</ins><span class="cx"> */
</span><span class="cx"> function wp_admin_css( $file = 'wp-admin', $force_echo = false ) {
</span><span class="cx"> global $wp_styles;
</span><span class="lines">@@ -2091,7 +2091,7 @@
</span><span class="cx"> $handle = 0 === strpos( $file, 'css/' ) ? substr( $file, 4 ) : $file;
</span><span class="cx">
</span><span class="cx"> if ( $wp_styles->query( $handle ) ) {
</span><del>- if ( $force_echo || did_action( 'wp_print_styles' ) ) // we already printed the style queue. Print this one immediately
</del><ins>+ if ( $force_echo || did_action( 'wp_print_styles' ) ) // we already printed the style queue. Print this one immediately
</ins><span class="cx"> wp_print_styles( $handle );
</span><span class="cx"> else // Add to style queue
</span><span class="cx"> wp_enqueue_style( $handle );
</span></span></pre></div>
<a id="trunkwpincludeshttpphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/http.php (19592 => 19593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/http.php 2011-12-12 22:25:58 UTC (rev 19592)
+++ trunk/wp-includes/http.php 2011-12-13 23:45:31 UTC (rev 19593)
</span><span class="lines">@@ -197,7 +197,7 @@
</span><span class="cx"> * @since 3.2.0
</span><span class="cx"> *
</span><span class="cx"> * @param array $capabilities Array of capabilities to test or a wp_remote_request() $args array.
</span><del>- * @param string $url Optional. If given, will check if the URL requires SSL and adds that requirement to the capabilities array.
</del><ins>+ * @param string $url Optional. If given, will check if the URL requires SSL and adds that requirement to the capabilities array.
</ins><span class="cx"> *
</span><span class="cx"> * @return bool
</span><span class="cx"> */
</span></span></pre></div>
<a id="trunkwpincludesjsautosavedevjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/autosave.dev.js (19592 => 19593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/autosave.dev.js 2011-12-12 22:25:58 UTC (rev 19592)
+++ trunk/wp-includes/js/autosave.dev.js 2011-12-13 23:45:31 UTC (rev 19593)
</span><span class="lines">@@ -229,7 +229,7 @@
</span><span class="cx">
</span><span class="cx"> function autosave_disable_buttons() {
</span><span class="cx"> jQuery(':button, :submit', '#submitpost').prop('disabled', true);
</span><del>- // Re-enable 5 sec later. Just gives autosave a head start to avoid collisions.
</del><ins>+ // Re-enable 5 sec later. Just gives autosave a head start to avoid collisions.
</ins><span class="cx"> setTimeout(autosave_enable_buttons, 5000);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludesksesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/kses.php (19592 => 19593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/kses.php 2011-12-12 22:25:58 UTC (rev 19592)
+++ trunk/wp-includes/kses.php 2011-12-13 23:45:31 UTC (rev 19593)
</span><span class="lines">@@ -10,7 +10,7 @@
</span><span class="cx"> *
</span><span class="cx"> * This program is distributed in the hope that it will be useful, but WITHOUT
</span><span class="cx"> * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
</span><del>- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
</del><ins>+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
</ins><span class="cx"> * more details.
</span><span class="cx"> *
</span><span class="cx"> * You should have received a copy of the GNU General Public License along
</span><span class="lines">@@ -718,7 +718,7 @@
</span><span class="cx"> * input. It will add quotes around attribute values that don't have any quotes
</span><span class="cx"> * or apostrophes around them, to make it easier to produce HTML code that will
</span><span class="cx"> * conform to W3C's HTML specification. It will also remove bad URL protocols
</span><del>- * from attribute values. It also reduces duplicate attributes by using the
</del><ins>+ * from attribute values. It also reduces duplicate attributes by using the
</ins><span class="cx"> * attribute defined first (foo='bar' foo='baz' will result in foo='bar').
</span><span class="cx"> *
</span><span class="cx"> * @since 1.0.0
</span></span></pre></div>
<a id="trunkwpincludeslinktemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/link-template.php (19592 => 19593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/link-template.php 2011-12-12 22:25:58 UTC (rev 19592)
+++ trunk/wp-includes/link-template.php 2011-12-13 23:45:31 UTC (rev 19593)
</span><span class="lines">@@ -507,7 +507,7 @@
</span><span class="cx"> * @since 2.5.0
</span><span class="cx"> *
</span><span class="cx"> * @param string $link_text Descriptive text.
</span><del>- * @param int $post_id Optional post ID. Default to current post.
</del><ins>+ * @param int $post_id Optional post ID. Default to current post.
</ins><span class="cx"> * @param string $feed Optional. Feed format.
</span><span class="cx"> * @return string Link to the comment feed for the current post.
</span><span class="cx"> */
</span><span class="lines">@@ -2187,7 +2187,7 @@
</span><span class="cx"> /**
</span><span class="cx"> * Get the URL to the user's dashboard.
</span><span class="cx"> *
</span><del>- * If a user does not belong to any site, the global user dashboard is used. If the user belongs to the current site,
</del><ins>+ * If a user does not belong to any site, the global user dashboard is used. If the user belongs to the current site,
</ins><span class="cx"> * the dashboard for the current site is returned. If the user cannot edit the current site, the dashboard to the user's
</span><span class="cx"> * primary blog is returned.
</span><span class="cx"> *
</span></span></pre></div>
<a id="trunkwpincludesloadphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/load.php (19592 => 19593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/load.php 2011-12-12 22:25:58 UTC (rev 19592)
+++ trunk/wp-includes/load.php 2011-12-13 23:45:31 UTC (rev 19593)
</span><span class="lines">@@ -568,7 +568,7 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> function wp_clone( $object ) {
</span><del>- // Use parens for clone to accommodate PHP 4. See #17880
</del><ins>+ // Use parens for clone to accommodate PHP 4. See #17880
</ins><span class="cx"> return clone( $object );
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludeslocalephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/locale.php (19592 => 19593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/locale.php 2011-12-12 22:25:58 UTC (rev 19592)
+++ trunk/wp-includes/locale.php 2011-12-13 23:45:31 UTC (rev 19593)
</span><span class="lines">@@ -113,7 +113,7 @@
</span><span class="cx"> $this->weekday[5] = /* translators: weekday */ __('Friday');
</span><span class="cx"> $this->weekday[6] = /* translators: weekday */ __('Saturday');
</span><span class="cx">
</span><del>- // The first letter of each day. The _%day%_initial suffix is a hack to make
</del><ins>+ // The first letter of each day. The _%day%_initial suffix is a hack to make
</ins><span class="cx"> // sure the day initials are unique.
</span><span class="cx"> $this->weekday_initial[__('Sunday')] = /* translators: one-letter abbreviation of the weekday */ __('S_Sunday_initial');
</span><span class="cx"> $this->weekday_initial[__('Monday')] = /* translators: one-letter abbreviation of the weekday */ __('M_Monday_initial');
</span></span></pre></div>
<a id="trunkwpincludesmediaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/media.php (19592 => 19593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/media.php 2011-12-12 22:25:58 UTC (rev 19592)
+++ trunk/wp-includes/media.php 2011-12-13 23:45:31 UTC (rev 19593)
</span><span class="lines">@@ -53,9 +53,9 @@
</span><span class="cx"> // if no width is set, default to the theme content width if available
</span><span class="cx"> }
</span><span class="cx"> elseif ( $size == 'large' ) {
</span><del>- // we're inserting a large size image into the editor. if it's a really
</del><ins>+ // We're inserting a large size image into the editor. If it's a really
</ins><span class="cx"> // big image we'll scale it down to fit reasonably within the editor
</span><del>- // itself, and within the theme's content width if it's known. the user
</del><ins>+ // itself, and within the theme's content width if it's known. The user
</ins><span class="cx"> // can resize it in the editor if they wish.
</span><span class="cx"> $max_width = intval(get_option('large_size_w'));
</span><span class="cx"> $max_height = intval(get_option('large_size_h'));
</span></span></pre></div>
<a id="trunkwpincludesmetaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/meta.php (19592 => 19593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/meta.php 2011-12-12 22:25:58 UTC (rev 19592)
+++ trunk/wp-includes/meta.php 2011-12-13 23:45:31 UTC (rev 19593)
</span><span class="lines">@@ -2,8 +2,8 @@
</span><span class="cx"> /**
</span><span class="cx"> * Metadata API
</span><span class="cx"> *
</span><del>- * Functions for retrieving and manipulating metadata of various WordPress object types. Metadata
- * for an object is a represented by a simple key-value pair. Objects may contain multiple
</del><ins>+ * Functions for retrieving and manipulating metadata of various WordPress object types. Metadata
+ * for an object is a represented by a simple key-value pair. Objects may contain multiple
</ins><span class="cx"> * metadata entries that share the same key and differ only in their value.
</span><span class="cx"> *
</span><span class="cx"> * @package WordPress
</span><span class="lines">@@ -23,8 +23,8 @@
</span><span class="cx"> * @param int $object_id ID of the object metadata is for
</span><span class="cx"> * @param string $meta_key Metadata key
</span><span class="cx"> * @param string $meta_value Metadata value
</span><del>- * @param bool $unique Optional, default is false. Whether the specified metadata key should be
- * unique for the object. If true, and the object already has a value for the specified
</del><ins>+ * @param bool $unique Optional, default is false. Whether the specified metadata key should be
+ * unique for the object. If true, and the object already has a value for the specified
</ins><span class="cx"> * metadata key, no change will be made
</span><span class="cx"> * @return bool The meta ID on successful update, false on failure.
</span><span class="cx"> */
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Update metadata for the specified object. If no value already exists for the specified object
</del><ins>+ * Update metadata for the specified object. If no value already exists for the specified object
</ins><span class="cx"> * ID and metadata key, the metadata will be added.
</span><span class="cx"> *
</span><span class="cx"> * @since 2.9.0
</span><span class="lines">@@ -94,8 +94,8 @@
</span><span class="cx"> * @param int $object_id ID of the object metadata is for
</span><span class="cx"> * @param string $meta_key Metadata key
</span><span class="cx"> * @param string $meta_value Metadata value
</span><del>- * @param string $prev_value Optional. If specified, only update existing metadata entries with
- * the specified value. Otherwise, update all entries.
</del><ins>+ * @param string $prev_value Optional. If specified, only update existing metadata entries with
+ * the specified value. Otherwise, update all entries.
</ins><span class="cx"> * @return bool True on successful update, false on failure.
</span><span class="cx"> */
</span><span class="cx"> function update_metadata($meta_type, $object_id, $meta_key, $meta_value, $prev_value = '') {
</span><span class="lines">@@ -174,10 +174,10 @@
</span><span class="cx"> * @param string $meta_type Type of object metadata is for (e.g., comment, post, or user)
</span><span class="cx"> * @param int $object_id ID of the object metadata is for
</span><span class="cx"> * @param string $meta_key Metadata key
</span><del>- * @param string $meta_value Optional. Metadata value. If specified, only delete metadata entries
- * with this value. Otherwise, delete all entries with the specified meta_key.
- * @param bool $delete_all Optional, default is false. If true, delete matching metadata entries
- * for all objects, ignoring the specified object_id. Otherwise, only delete matching
</del><ins>+ * @param string $meta_value Optional. Metadata value. If specified, only delete metadata entries
+ * with this value. Otherwise, delete all entries with the specified meta_key.
+ * @param bool $delete_all Optional, default is false. If true, delete matching metadata entries
+ * for all objects, ignoring the specified object_id. Otherwise, only delete matching
</ins><span class="cx"> * metadata entries for the specified object_id.
</span><span class="cx"> * @return bool True on successful delete, false on failure.
</span><span class="cx"> */
</span><span class="lines">@@ -256,10 +256,10 @@
</span><span class="cx"> *
</span><span class="cx"> * @param string $meta_type Type of object metadata is for (e.g., comment, post, or user)
</span><span class="cx"> * @param int $object_id ID of the object metadata is for
</span><del>- * @param string $meta_key Optional. Metadata key. If not specified, retrieve all metadata for
</del><ins>+ * @param string $meta_key Optional. Metadata key. If not specified, retrieve all metadata for
</ins><span class="cx"> * the specified object.
</span><del>- * @param bool $single Optional, default is false. If true, return only the first value of the
- * specified meta_key. This parameter has no effect if meta_key is not specified.
</del><ins>+ * @param bool $single Optional, default is false. If true, return only the first value of the
+ * specified meta_key. This parameter has no effect if meta_key is not specified.
</ins><span class="cx"> * @return string|array Single metadata value, or array of values
</span><span class="cx"> */
</span><span class="cx"> function get_metadata($meta_type, $object_id, $meta_key = '', $single = false) {
</span></span></pre></div>
<a id="trunkwpincludesmsfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/ms-functions.php (19592 => 19593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ms-functions.php 2011-12-12 22:25:58 UTC (rev 19592)
+++ trunk/wp-includes/ms-functions.php 2011-12-13 23:45:31 UTC (rev 19593)
</span><span class="lines">@@ -880,7 +880,7 @@
</span><span class="cx"> // TODO: What to do if we create a user but cannot create a blog?
</span><span class="cx"> if ( is_wp_error($blog_id) ) {
</span><span class="cx"> // If blog is taken, that means a previous attempt to activate this blog failed in between creating the blog and
</span><del>- // setting the activation flag. Let's just set the active flag and instruct the user to reset their password.
</del><ins>+ // setting the activation flag. Let's just set the active flag and instruct the user to reset their password.
</ins><span class="cx"> if ( 'blog_taken' == $blog_id->get_error_code() ) {
</span><span class="cx"> $blog_id->add_data( $signup );
</span><span class="cx"> $wpdb->update( $wpdb->signups, array( 'active' => 1, 'activated' => $now ), array( 'activation_key' => $key ) );
</span></span></pre></div>
<a id="trunkwpincludesnavmenutemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/nav-menu-template.php (19592 => 19593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/nav-menu-template.php 2011-12-12 22:25:58 UTC (rev 19592)
+++ trunk/wp-includes/nav-menu-template.php 2011-12-13 23:45:31 UTC (rev 19593)
</span><span class="lines">@@ -113,7 +113,7 @@
</span><span class="cx"> *
</span><span class="cx"> * Optional $args contents:
</span><span class="cx"> *
</span><del>- * menu - The menu that is desired. Accepts (matching in order) id, slug, name. Defaults to blank.
</del><ins>+ * menu - The menu that is desired. Accepts (matching in order) id, slug, name. Defaults to blank.
</ins><span class="cx"> * menu_class - CSS class to use for the ul element which forms the menu. Defaults to 'menu'.
</span><span class="cx"> * menu_id - The ID that is applied to the ul element which forms the menu. Defaults to the menu slug, incremented.
</span><span class="cx"> * container - Whether to wrap the ul, and what to wrap it with. Defaults to 'div'.
</span><span class="lines">@@ -125,9 +125,9 @@
</span><span class="cx"> * link_before - Text before the link.
</span><span class="cx"> * link_after - Text after the link.
</span><span class="cx"> * echo - Whether to echo the menu or return it. Defaults to echo.
</span><del>- * depth - how many levels of the hierarchy are to be included. 0 means all. Defaults to 0.
</del><ins>+ * depth - how many levels of the hierarchy are to be included. 0 means all. Defaults to 0.
</ins><span class="cx"> * walker - allows a custom walker to be specified.
</span><del>- * theme_location - the location in the theme to be used. Must be registered with register_nav_menu() in order to be selectable by the user.
</del><ins>+ * theme_location - the location in the theme to be used. Must be registered with register_nav_menu() in order to be selectable by the user.
</ins><span class="cx"> * items_wrap - How the list items should be wrapped. Defaults to a ul with an id and class. Uses printf() format with numbered placeholders.
</span><span class="cx"> *
</span><span class="cx"> * @since 3.0.0
</span></span></pre></div>
<a id="trunkwpincludesnavmenuphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/nav-menu.php (19592 => 19593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/nav-menu.php 2011-12-12 22:25:58 UTC (rev 19592)
+++ trunk/wp-includes/nav-menu.php 2011-12-13 23:45:31 UTC (rev 19593)
</span><span class="lines">@@ -554,7 +554,7 @@
</span><span class="cx"> * - object: The type of object originally represented, such as "category," "post", or "attachment."
</span><span class="cx"> * - type_label: The singular label used to describe this type of menu item.
</span><span class="cx"> * - post_parent: The DB ID of the original object's parent object, if any (0 otherwise).
</span><del>- * - menu_item_parent: The DB ID of the nav_menu_item that is this item's menu parent, if any. 0 otherwise.
</del><ins>+ * - menu_item_parent: The DB ID of the nav_menu_item that is this item's menu parent, if any. 0 otherwise.
</ins><span class="cx"> * - url: The URL to which this menu item points.
</span><span class="cx"> * - title: The title of this menu item.
</span><span class="cx"> * - target: The target attribute of the link element for this menu item.
</span></span></pre></div>
<a id="trunkwpincludespluggablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/pluggable.php (19592 => 19593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/pluggable.php 2011-12-12 22:25:58 UTC (rev 19592)
+++ trunk/wp-includes/pluggable.php 2011-12-13 23:45:31 UTC (rev 19593)
</span><span class="lines">@@ -111,8 +111,8 @@
</span><span class="cx"> *
</span><span class="cx"> * @since 2.8.0
</span><span class="cx"> *
</span><del>- * @param string $field The field to retrieve the user with. id | slug | email | login
- * @param int|string $value A value for $field. A user ID, slug, email address, or login name.
</del><ins>+ * @param string $field The field to retrieve the user with. id | slug | email | login
+ * @param int|string $value A value for $field. A user ID, slug, email address, or login name.
</ins><span class="cx"> * @return bool|object False on failure, WP_User object on success
</span><span class="cx"> */
</span><span class="cx"> function get_user_by( $field, $value ) {
</span></span></pre></div>
<a id="trunkwpincludespluginphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/plugin.php (19592 => 19593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/plugin.php 2011-12-12 22:25:58 UTC (rev 19592)
+++ trunk/wp-includes/plugin.php 2011-12-13 23:45:31 UTC (rev 19593)
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx"> * @global array $wp_filter Stores all of the filters
</span><span class="cx"> *
</span><span class="cx"> * @param string $tag The name of the filter hook.
</span><del>- * @param callback $function_to_check optional. If specified, return the priority of that function on this hook or false if not attached.
</del><ins>+ * @param callback $function_to_check optional. If specified, return the priority of that function on this hook or false if not attached.
</ins><span class="cx"> * @return int|boolean Optionally returns the priority on that hook for the specified function.
</span><span class="cx"> */
</span><span class="cx"> function has_filter($tag, $function_to_check = false) {
</span><span class="lines">@@ -499,7 +499,7 @@
</span><span class="cx"> * @see has_filter() has_action() is an alias of has_filter().
</span><span class="cx"> *
</span><span class="cx"> * @param string $tag The name of the action hook.
</span><del>- * @param callback $function_to_check optional. If specified, return the priority of that function on this hook or false if not attached.
</del><ins>+ * @param callback $function_to_check optional. If specified, return the priority of that function on this hook or false if not attached.
</ins><span class="cx"> * @return int|boolean Optionally returns the priority on that hook for the specified function.
</span><span class="cx"> */
</span><span class="cx"> function has_action($tag, $function_to_check = false) {
</span><span class="lines">@@ -744,7 +744,7 @@
</span><span class="cx"> * @global array $wp_filter Storage for all of the filters and actions
</span><span class="cx"> * @param string $tag Used in counting how many hooks were applied
</span><span class="cx"> * @param callback $function Used for creating unique id
</span><del>- * @param int|bool $priority Used in counting how many hooks were applied. If === false and $function is an object reference, we return the unique id only if it already has one, false otherwise.
</del><ins>+ * @param int|bool $priority Used in counting how many hooks were applied. If === false and $function is an object reference, we return the unique id only if it already has one, false otherwise.
</ins><span class="cx"> * @return string|bool Unique ID for usage as array key or false if $priority === false and $function is an object reference, and it does not already have a unique id.
</span><span class="cx"> */
</span><span class="cx"> function _wp_filter_build_unique_id($tag, $function, $priority) {
</span></span></pre></div>
<a id="trunkwpincludesposttemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/post-template.php (19592 => 19593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/post-template.php 2011-12-12 22:25:58 UTC (rev 19592)
+++ trunk/wp-includes/post-template.php 2011-12-13 23:45:31 UTC (rev 19593)
</span><span class="lines">@@ -555,7 +555,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @since 2.7.0
</span><span class="cx"> *
</span><del>- * @param int|object $post An optional post. Global $post used if not provided.
</del><ins>+ * @param int|object $post An optional post. Global $post used if not provided.
</ins><span class="cx"> * @return bool false if a password is not required or the correct password cookie is present, true otherwise.
</span><span class="cx"> */
</span><span class="cx"> function post_password_required( $post = null ) {
</span><span class="lines">@@ -1307,7 +1307,7 @@
</span><span class="cx"> *
</span><span class="cx"> * Second argument controls parameters:
</span><span class="cx"> * (bool) parent : include the parent (the "Current Revision") in the list.
</span><del>- * (string) format : 'list' or 'form-table'. 'list' outputs UL, 'form-table'
</del><ins>+ * (string) format : 'list' or 'form-table'. 'list' outputs UL, 'form-table'
</ins><span class="cx"> * outputs TABLE with UI.
</span><span class="cx"> * (int) right : what revision is currently being viewed - used in
</span><span class="cx"> * form-table format.
</span></span></pre></div>
<a id="trunkwpincludespostthumbnailtemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/post-thumbnail-template.php (19592 => 19593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/post-thumbnail-template.php 2011-12-12 22:25:58 UTC (rev 19592)
+++ trunk/wp-includes/post-thumbnail-template.php 2011-12-13 23:45:31 UTC (rev 19593)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @since 2.9.0
</span><span class="cx"> *
</span><del>- * @param int $size Optional. Image size. Defaults to 'post-thumbnail', which theme sets using set_post_thumbnail_size( $width, $height, $crop_flag );.
</del><ins>+ * @param int $size Optional. Image size. Defaults to 'post-thumbnail', which theme sets using set_post_thumbnail_size( $width, $height, $crop_flag );.
</ins><span class="cx"> * @param string|array $attr Optional. Query string or array of attributes.
</span><span class="cx"> */
</span><span class="cx"> function the_post_thumbnail( $size = 'post-thumbnail', $attr = '' ) {
</span><span class="lines">@@ -82,7 +82,7 @@
</span><span class="cx"> * @since 2.9.0
</span><span class="cx"> *
</span><span class="cx"> * @param int $post_id Optional. Post ID.
</span><del>- * @param string $size Optional. Image size. Defaults to 'thumbnail'.
</del><ins>+ * @param string $size Optional. Image size. Defaults to 'thumbnail'.
</ins><span class="cx"> * @param string|array $attr Optional. Query string or array of attributes.
</span><span class="cx"> */
</span><span class="cx"> function get_the_post_thumbnail( $post_id = null, $size = 'post-thumbnail', $attr = '' ) {
</span></span></pre></div>
<a id="trunkwpincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/post.php (19592 => 19593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/post.php 2011-12-12 22:25:58 UTC (rev 19592)
+++ trunk/wp-includes/post.php 2011-12-13 23:45:31 UTC (rev 19593)
</span><span class="lines">@@ -493,7 +493,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @param int|object $post A post
</span><span class="cx"> *
</span><del>- * @return mixed The format if successful. False if no format is set. WP_Error if errors.
</del><ins>+ * @return mixed The format if successful. False if no format is set. WP_Error if errors.
</ins><span class="cx"> */
</span><span class="cx"> function get_post_format( $post = null ) {
</span><span class="cx"> $post = get_post($post);
</span><span class="lines">@@ -531,7 +531,7 @@
</span><span class="cx"> * @since 3.1.0
</span><span class="cx"> *
</span><span class="cx"> * @param int|object $post The post for which to assign a format
</span><del>- * @param string $format A format to assign. Use an empty string or array to remove all formats from the post.
</del><ins>+ * @param string $format A format to assign. Use an empty string or array to remove all formats from the post.
</ins><span class="cx"> * @return mixed WP_Error on error. Array of affected term IDs on success.
</span><span class="cx"> */
</span><span class="cx"> function set_post_format( $post, $format ) {
</span><span class="lines">@@ -887,7 +887,7 @@
</span><span class="cx"> * - supports - An alias for calling add_post_type_support() directly. See {@link add_post_type_support()}
</span><span class="cx"> * for documentation. Defaults to none.
</span><span class="cx"> * - register_meta_box_cb - Provide a callback function that will be called when setting up the
</span><del>- * meta boxes for the edit form. Do remove_meta_box() and add_meta_box() calls in the callback.
</del><ins>+ * meta boxes for the edit form. Do remove_meta_box() and add_meta_box() calls in the callback.
</ins><span class="cx"> * - taxonomies - An array of taxonomy identifiers that will be registered for the post type.
</span><span class="cx"> * Default is no taxonomies. Taxonomies can be registered later with register_taxonomy() or
</span><span class="cx"> * register_taxonomy_for_object_type().
</span><span class="lines">@@ -952,7 +952,7 @@
</span><span class="cx"> if ( null === $args->show_in_admin_bar )
</span><span class="cx"> $args->show_in_admin_bar = true === $args->show_in_menu;
</span><span class="cx">
</span><del>- // Whether to show this type in nav-menus.php. Defaults to the setting for public.
</del><ins>+ // Whether to show this type in nav-menus.php. Defaults to the setting for public.
</ins><span class="cx"> if ( null === $args->show_in_nav_menus )
</span><span class="cx"> $args->show_in_nav_menus = $args->public;
</span><span class="cx">
</span><span class="lines">@@ -2005,9 +2005,9 @@
</span><span class="cx"> unstick_post($postid);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // Do raw query. wp_get_post_revisions() is filtered
</del><ins>+ // Do raw query. wp_get_post_revisions() is filtered
</ins><span class="cx"> $revision_ids = $wpdb->get_col( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_parent = %d AND post_type = 'revision'", $postid ) );
</span><del>- // Use wp_delete_post (via wp_delete_post_revision) again. Ensures any meta/misplaced data gets cleaned up.
</del><ins>+ // Use wp_delete_post (via wp_delete_post_revision) again. Ensures any meta/misplaced data gets cleaned up.
</ins><span class="cx"> foreach ( $revision_ids as $revision_id )
</span><span class="cx"> wp_delete_post_revision( $revision_id );
</span><span class="cx">
</span><span class="lines">@@ -2482,7 +2482,7 @@
</span><span class="cx"> if ( 'pending' == $post_status && !current_user_can( 'publish_posts' ) )
</span><span class="cx"> $post_name = '';
</span><span class="cx">
</span><del>- // Create a valid post name. Drafts and pending posts are allowed to have an empty
</del><ins>+ // Create a valid post name. Drafts and pending posts are allowed to have an empty
</ins><span class="cx"> // post name.
</span><span class="cx"> if ( empty($post_name) ) {
</span><span class="cx"> if ( !in_array( $post_status, array( 'draft', 'pending', 'auto-draft' ) ) )
</span><span class="lines">@@ -4150,8 +4150,8 @@
</span><span class="cx"> *
</span><span class="cx"> * @since 3.0.0
</span><span class="cx"> * @param string $post_type Post type.
</span><del>- * @param bool $full Optional. Returns a full WHERE statement instead of just an 'andalso' term.
- * @param int $post_author Optional. Query posts having a single author ID.
</del><ins>+ * @param bool $full Optional. Returns a full WHERE statement instead of just an 'andalso' term.
+ * @param int $post_author Optional. Query posts having a single author ID.
</ins><span class="cx"> * @return string SQL WHERE code that can be added to a query.
</span><span class="cx"> */
</span><span class="cx"> function get_posts_by_author_sql( $post_type, $full = true, $post_author = null ) {
</span><span class="lines">@@ -4902,7 +4902,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @param int|object $post Post ID or post object
</span><span class="cx"> * @param string $output Optional. OBJECT, ARRAY_A, or ARRAY_N.
</span><del>- * @param string $filter Optional sanitation filter. @see sanitize_post()
</del><ins>+ * @param string $filter Optional sanitation filter. @see sanitize_post()
</ins><span class="cx"> * @return mixed Null if error or post object if success
</span><span class="cx"> */
</span><span class="cx"> function &wp_get_post_revision(&$post, $output = OBJECT, $filter = 'raw') {
</span><span class="lines">@@ -5110,7 +5110,7 @@
</span><span class="cx"> if ( isset( $loop[$post_ID] ) )
</span><span class="cx"> return 0;
</span><span class="cx">
</span><del>- // There's a loop, but it doesn't contain $post_ID. Break the loop.
</del><ins>+ // There's a loop, but it doesn't contain $post_ID. Break the loop.
</ins><span class="cx"> foreach ( array_keys( $loop ) as $loop_member )
</span><span class="cx"> wp_update_post( array( 'ID' => $loop_member, 'post_parent' => 0 ) );
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludesqueryphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/query.php (19592 => 19593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/query.php 2011-12-12 22:25:58 UTC (rev 19592)
+++ trunk/wp-includes/query.php 2011-12-13 23:45:31 UTC (rev 19593)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Retrieve the currently-queried object. Wrapper for $wp_query->get_queried_object()
</del><ins>+ * Retrieve the currently-queried object. Wrapper for $wp_query->get_queried_object()
</ins><span class="cx"> *
</span><span class="cx"> * @uses WP_Query::get_queried_object
</span><span class="cx"> *
</span><span class="lines">@@ -728,7 +728,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /*
</span><del>- * The Loop. Post loop control.
</del><ins>+ * The Loop. Post loop control.
</ins><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -1261,7 +1261,7 @@
</span><span class="cx"> var $query_vars_hash = false;
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Whether query vars have changed since the initial parse_query() call. Used to catch modifications to query vars made
</del><ins>+ * Whether query vars have changed since the initial parse_query() call. Used to catch modifications to query vars made
</ins><span class="cx"> * via pre_get_posts hooks.
</span><span class="cx"> *
</span><span class="cx"> * @since 3.1.1
</span><span class="lines">@@ -1454,7 +1454,7 @@
</span><span class="cx"> if ( '' !== $qv['minute'] ) $qv['minute'] = absint($qv['minute']);
</span><span class="cx"> if ( '' !== $qv['second'] ) $qv['second'] = absint($qv['second']);
</span><span class="cx">
</span><del>- // Compat. Map subpost to attachment.
</del><ins>+ // Compat. Map subpost to attachment.
</ins><span class="cx"> if ( '' != $qv['subpost'] )
</span><span class="cx"> $qv['attachment'] = $qv['subpost'];
</span><span class="cx"> if ( '' != $qv['subpost_id'] )
</span><span class="lines">@@ -1477,7 +1477,7 @@
</span><span class="cx"> $this->is_page = true;
</span><span class="cx"> $this->is_single = false;
</span><span class="cx"> } else {
</span><del>- // Look for archive queries. Dates, categories, authors, search, post type archives.
</del><ins>+ // Look for archive queries. Dates, categories, authors, search, post type archives.
</ins><span class="cx">
</span><span class="cx"> if ( !empty($qv['s']) ) {
</span><span class="cx"> $this->is_search = true;
</span><span class="lines">@@ -2449,13 +2449,13 @@
</span><span class="cx"> }
</span><span class="cx"> if ( !empty($r_status) ) {
</span><span class="cx"> if ( !empty($q['perm'] ) && 'editable' == $q['perm'] && !current_user_can($edit_others_cap) )
</span><del>- $statuswheres[] = "($wpdb->posts.post_author = $user_ID " . "AND (" . join( ' OR ', $r_status ) . "))";
</del><ins>+ $statuswheres[] = "($wpdb->posts.post_author = $user_ID " . "AND (" . join( ' OR ', $r_status ) . "))";
</ins><span class="cx"> else
</span><span class="cx"> $statuswheres[] = "(" . join( ' OR ', $r_status ) . ")";
</span><span class="cx"> }
</span><span class="cx"> if ( !empty($p_status) ) {
</span><span class="cx"> if ( !empty($q['perm'] ) && 'readable' == $q['perm'] && !current_user_can($read_private_cap) )
</span><del>- $statuswheres[] = "($wpdb->posts.post_author = $user_ID " . "AND (" . join( ' OR ', $p_status ) . "))";
</del><ins>+ $statuswheres[] = "($wpdb->posts.post_author = $user_ID " . "AND (" . join( ' OR ', $p_status ) . "))";
</ins><span class="cx"> else
</span><span class="cx"> $statuswheres[] = "(" . join( ' OR ', $p_status ) . ")";
</span><span class="cx"> }
</span><span class="lines">@@ -2564,7 +2564,7 @@
</span><span class="cx">
</span><span class="cx"> $pieces = array( 'where', 'groupby', 'join', 'orderby', 'distinct', 'fields', 'limits' );
</span><span class="cx">
</span><del>- // Apply post-paging filters on where and join. Only plugins that
</del><ins>+ // Apply post-paging filters on where and join. Only plugins that
</ins><span class="cx"> // manipulate paging queries should use these hooks.
</span><span class="cx"> if ( !$q['suppress_filters'] ) {
</span><span class="cx"> $where = apply_filters_ref_array( 'posts_where_paged', array( $where, &$this ) );
</span><span class="lines">@@ -2581,10 +2581,10 @@
</span><span class="cx"> $$piece = isset( $clauses[ $piece ] ) ? $clauses[ $piece ] : '';
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // Announce current selection parameters. For use by caching plugins.
</del><ins>+ // Announce current selection parameters. For use by caching plugins.
</ins><span class="cx"> do_action( 'posts_selection', $where . $groupby . $orderby . $limits . $join );
</span><span class="cx">
</span><del>- // Filter again for the benefit of caching plugins. Regular plugins should use the hooks above.
</del><ins>+ // Filter again for the benefit of caching plugins. Regular plugins should use the hooks above.
</ins><span class="cx"> if ( !$q['suppress_filters'] ) {
</span><span class="cx"> $where = apply_filters_ref_array( 'posts_where_request', array( $where, &$this ) );
</span><span class="cx"> $groupby = apply_filters_ref_array( 'posts_groupby_request', array( $groupby, &$this ) );
</span><span class="lines">@@ -2631,7 +2631,7 @@
</span><span class="cx">
</span><span class="cx"> $this->posts = $wpdb->get_results($this->request);
</span><span class="cx">
</span><del>- // Raw results filter. Prior to status checks.
</del><ins>+ // Raw results filter. Prior to status checks.
</ins><span class="cx"> if ( !$q['suppress_filters'] )
</span><span class="cx"> $this->posts = apply_filters_ref_array('posts_results', array( $this->posts, &$this ) );
</span><span class="cx">
</span><span class="lines">@@ -2700,7 +2700,7 @@
</span><span class="cx"> array_splice($this->posts, $i, 1);
</span><span class="cx"> // Move to front, after other stickies
</span><span class="cx"> array_splice($this->posts, $sticky_offset, 0, array($sticky_post));
</span><del>- // Increment the sticky offset. The next sticky will be placed at this offset.
</del><ins>+ // Increment the sticky offset. The next sticky will be placed at this offset.
</ins><span class="cx"> $sticky_offset++;
</span><span class="cx"> // Remove post from sticky posts array
</span><span class="cx"> $offset = array_search($sticky_post->ID, $sticky_posts);
</span></span></pre></div>
<a id="trunkwpincludesrewritephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/rewrite.php (19592 => 19593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/rewrite.php 2011-12-12 22:25:58 UTC (rev 19592)
+++ trunk/wp-includes/rewrite.php 2011-12-13 23:45:31 UTC (rev 19593)
</span><span class="lines">@@ -1189,11 +1189,11 @@
</span><span class="cx"> $feedregex2 = '';
</span><span class="cx"> foreach ( (array) $this->feeds as $feed_name)
</span><span class="cx"> $feedregex2 .= $feed_name . '|';
</span><del>- $feedregex2 = '(' . trim($feedregex2, '|') . ')/?$';
</del><ins>+ $feedregex2 = '(' . trim($feedregex2, '|') . ')/?$';
</ins><span class="cx">
</span><span class="cx"> //$feedregex is identical but with /feed/ added on as well, so URLs like <permalink>/feed/atom
</span><span class="cx"> //and <permalink>/atom are both possible
</span><del>- $feedregex = $this->feed_base . '/' . $feedregex2;
</del><ins>+ $feedregex = $this->feed_base . '/' . $feedregex2;
</ins><span class="cx">
</span><span class="cx"> //build a regex to match the trackback and page/xx parts of URLs
</span><span class="cx"> $trackbackregex = 'trackback/?$';
</span></span></pre></div>
<a id="trunkwpincludesrssfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/rss-functions.php (19592 => 19593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/rss-functions.php 2011-12-12 22:25:58 UTC (rev 19592)
+++ trunk/wp-includes/rss-functions.php 2011-12-13 23:45:31 UTC (rev 19593)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> <?php
</span><span class="cx"> /**
</span><del>- * Deprecated. Use rss.php instead.
</del><ins>+ * Deprecated. Use rss.php instead.
</ins><span class="cx"> *
</span><span class="cx"> * @package WordPress
</span><span class="cx"> */
</span></span></pre></div>
<a id="trunkwpincludestaxonomyphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/taxonomy.php (19592 => 19593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/taxonomy.php 2011-12-12 22:25:58 UTC (rev 19592)
+++ trunk/wp-includes/taxonomy.php 2011-12-13 23:45:31 UTC (rev 19593)
</span><span class="lines">@@ -1083,19 +1083,19 @@
</span><span class="cx"> * hide_empty - Default is true. Will not return empty terms, which means
</span><span class="cx"> * terms whose count is 0 according to the given taxonomy.
</span><span class="cx"> *
</span><del>- * exclude - Default is an empty array. An array, comma- or space-delimited string
- * of term ids to exclude from the return array. If 'include' is non-empty,
</del><ins>+ * exclude - Default is an empty array. An array, comma- or space-delimited string
+ * of term ids to exclude from the return array. If 'include' is non-empty,
</ins><span class="cx"> * 'exclude' is ignored.
</span><span class="cx"> *
</span><del>- * exclude_tree - Default is an empty array. An array, comma- or space-delimited
</del><ins>+ * exclude_tree - Default is an empty array. An array, comma- or space-delimited
</ins><span class="cx"> * string of term ids to exclude from the return array, along with all of their
</span><del>- * descendant terms according to the primary taxonomy. If 'include' is non-empty,
</del><ins>+ * descendant terms according to the primary taxonomy. If 'include' is non-empty,
</ins><span class="cx"> * 'exclude_tree' is ignored.
</span><span class="cx"> *
</span><del>- * include - Default is an empty array. An array, comma- or space-delimited string
</del><ins>+ * include - Default is an empty array. An array, comma- or space-delimited string
</ins><span class="cx"> * of term ids to include in the return array.
</span><span class="cx"> *
</span><del>- * number - The maximum number of terms to return. Default is to return them all.
</del><ins>+ * number - The maximum number of terms to return. Default is to return them all.
</ins><span class="cx"> *
</span><span class="cx"> * offset - The number by which to offset the terms query.
</span><span class="cx"> *
</span><span class="lines">@@ -1109,7 +1109,7 @@
</span><span class="cx"> * (even if 'hide_empty' is set to true).
</span><span class="cx"> *
</span><span class="cx"> * search - Returned terms' names will contain the value of 'search',
</span><del>- * case-insensitive. Default is an empty string.
</del><ins>+ * case-insensitive. Default is an empty string.
</ins><span class="cx"> *
</span><span class="cx"> * name__like - Returned terms' names will begin with the value of 'name__like',
</span><span class="cx"> * case-insensitive. Default is empty string.
</span><span class="lines">@@ -1120,13 +1120,13 @@
</span><span class="cx"> * The 'get' argument, if set to 'all' instead of its default empty string,
</span><span class="cx"> * returns terms regardless of ancestry or whether the terms are empty.
</span><span class="cx"> *
</span><del>- * The 'child_of' argument, when used, should be set to the integer of a term ID. Its default
- * is 0. If set to a non-zero value, all returned terms will be descendants
- * of that term according to the given taxonomy. Hence 'child_of' is set to 0
</del><ins>+ * The 'child_of' argument, when used, should be set to the integer of a term ID. Its default
+ * is 0. If set to a non-zero value, all returned terms will be descendants
+ * of that term according to the given taxonomy. Hence 'child_of' is set to 0
</ins><span class="cx"> * if more than one taxonomy is passed in $taxonomies, because multiple taxonomies
</span><span class="cx"> * make term ancestry ambiguous.
</span><span class="cx"> *
</span><del>- * The 'parent' argument, when used, should be set to the integer of a term ID. Its default is
</del><ins>+ * The 'parent' argument, when used, should be set to the integer of a term ID. Its default is
</ins><span class="cx"> * the empty string '', which has a different meaning from the integer 0.
</span><span class="cx"> * If set to an integer value, all returned terms will have as an immediate
</span><span class="cx"> * ancestor the term whose ID is specified by that integer according to the given taxonomy.
</span><span class="lines">@@ -3094,7 +3094,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @param int $object_id ID of the object (post ID, link ID, ...)
</span><span class="cx"> * @param string $taxonomy Single taxonomy name
</span><del>- * @param int|string|array $terms Optional. Term term_id, name, slug or array of said
</del><ins>+ * @param int|string|array $terms Optional. Term term_id, name, slug or array of said
</ins><span class="cx"> * @return bool|WP_Error. WP_Error on input error.
</span><span class="cx"> */
</span><span class="cx"> function is_object_in_term( $object_id, $taxonomy, $terms = null ) {
</span><span class="lines">@@ -3240,7 +3240,7 @@
</span><span class="cx"> if ( isset( $loop[$term_id] ) )
</span><span class="cx"> return 0;
</span><span class="cx">
</span><del>- // There's a loop, but it doesn't contain $term_id. Break the loop.
</del><ins>+ // There's a loop, but it doesn't contain $term_id. Break the loop.
</ins><span class="cx"> foreach ( array_keys( $loop ) as $loop_member )
</span><span class="cx"> wp_update_term( $loop_member, $taxonomy, array( 'parent' => 0 ) );
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludesthemephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/theme.php (19592 => 19593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/theme.php 2011-12-12 22:25:58 UTC (rev 19592)
+++ trunk/wp-includes/theme.php 2011-12-13 23:45:31 UTC (rev 19593)
</span><span class="lines">@@ -393,9 +393,9 @@
</span><span class="cx"> if ( empty($stylesheet_dir) )
</span><span class="cx"> $stylesheet_dir = '/';
</span><span class="cx">
</span><del>- // Check for theme name collision. This occurs if a theme is copied to
- // a new theme directory and the theme header is not updated. Whichever
- // theme is first keeps the name. Subsequent themes get a suffix applied.
</del><ins>+ // Check for theme name collision. This occurs if a theme is copied to
+ // a new theme directory and the theme header is not updated. Whichever
+ // theme is first keeps the name. Subsequent themes get a suffix applied.
</ins><span class="cx"> // The Twenty Eleven, Twenty Ten, Default and Classic themes always trump
</span><span class="cx"> // their pretenders.
</span><span class="cx"> if ( isset($wp_themes[$name]) ) {
</span><span class="lines">@@ -1942,7 +1942,7 @@
</span><span class="cx"> switch ( $feature ) {
</span><span class="cx"> case 'post-thumbnails':
</span><span class="cx"> // post-thumbnails can be registered for only certain content/post types by passing
</span><del>- // an array of types to add_theme_support(). If no array was passed, then
</del><ins>+ // an array of types to add_theme_support(). If no array was passed, then
</ins><span class="cx"> // any type is accepted
</span><span class="cx"> if ( true === $_wp_theme_features[$feature] ) // Registered for all types
</span><span class="cx"> return true;
</span></span></pre></div>
<a id="trunkwpincludesuserphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/user.php (19592 => 19593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/user.php 2011-12-12 22:25:58 UTC (rev 19592)
+++ trunk/wp-includes/user.php 2011-12-13 23:45:31 UTC (rev 19593)
</span><span class="lines">@@ -828,7 +828,7 @@
</span><span class="cx"> * Count number of users who have each of the user roles.
</span><span class="cx"> *
</span><span class="cx"> * Assumes there are neither duplicated nor orphaned capabilities meta_values.
</span><del>- * Assumes role names are unique phrases. Same assumption made by WP_User_Query::prepare_query()
</del><ins>+ * Assumes role names are unique phrases. Same assumption made by WP_User_Query::prepare_query()
</ins><span class="cx"> * Using $strategy = 'time' this is CPU-intensive and should handle around 10^7 users.
</span><span class="cx"> * Using $strategy = 'memory' this is memory-intensive and should handle around 10^5 users, but see WP Bug #12257.
</span><span class="cx"> *
</span><span class="lines">@@ -973,7 +973,7 @@
</span><span class="cx"> * <li>id - Default is the value of the 'name' parameter. ID attribute of select element.</li>
</span><span class="cx"> * <li>class - Class attribute of select element.</li>
</span><span class="cx"> * <li>blog_id - ID of blog (Multisite only). Defaults to ID of current blog.</li>
</span><del>- * <li>who - Which users to query. Currently only 'authors' is supported. Default is all users.</li>
</del><ins>+ * <li>who - Which users to query. Currently only 'authors' is supported. Default is all users.</li>
</ins><span class="cx"> * </ol>
</span><span class="cx"> *
</span><span class="cx"> * @since 2.3.0
</span></span></pre></div>
<a id="trunkwpincludeswpdbphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/wp-db.php (19592 => 19593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/wp-db.php 2011-12-12 22:25:58 UTC (rev 19592)
+++ trunk/wp-includes/wp-db.php 2011-12-13 23:45:31 UTC (rev 19593)
</span><span class="lines">@@ -1191,7 +1191,7 @@
</span><span class="cx"> * @see wp_set_wpdb_vars()
</span><span class="cx"> *
</span><span class="cx"> * @param string $table table name
</span><del>- * @param array $data Data to insert (in column => value pairs). Both $data columns and $data values should be "raw" (neither should be SQL escaped).
</del><ins>+ * @param array $data Data to insert (in column => value pairs). Both $data columns and $data values should be "raw" (neither should be SQL escaped).
</ins><span class="cx"> * @param array|string $format Optional. An array of formats to be mapped to each of the value in $data. If string, that format will be used for all of the values in $data.
</span><span class="cx"> * A format is one of '%d', '%f', '%s' (integer, float, string). If omitted, all values in $data will be treated as strings unless otherwise specified in wpdb::$field_types.
</span><span class="cx"> * @param string $type Optional. What type of operation is this? INSERT or REPLACE. Defaults to INSERT.
</span><span class="lines">@@ -1234,7 +1234,7 @@
</span><span class="cx"> * @param array $where A named array of WHERE clauses (in column => value pairs). Multiple clauses will be joined with ANDs. Both $where columns and $where values should be "raw".
</span><span class="cx"> * @param array|string $format Optional. An array of formats to be mapped to each of the values in $data. If string, that format will be used for all of the values in $data.
</span><span class="cx"> * A format is one of '%d', '%f', '%s' (integer, float, string). If omitted, all values in $data will be treated as strings unless otherwise specified in wpdb::$field_types.
</span><del>- * @param array|string $where_format Optional. An array of formats to be mapped to each of the values in $where. If string, that format will be used for all of the items in $where. A format is one of '%d', '%f', '%s' (integer, float, string). If omitted, all values in $where will be treated as strings.
</del><ins>+ * @param array|string $where_format Optional. An array of formats to be mapped to each of the values in $where. If string, that format will be used for all of the items in $where. A format is one of '%d', '%f', '%s' (integer, float, string). If omitted, all values in $where will be treated as strings.
</ins><span class="cx"> * @return int|false The number of rows updated, or false on error.
</span><span class="cx"> */
</span><span class="cx"> function update( $table, $data, $where, $format = null, $where_format = null ) {
</span><span class="lines">@@ -1278,8 +1278,8 @@
</span><span class="cx"> * @since 0.71
</span><span class="cx"> *
</span><span class="cx"> * @param string|null $query Optional. SQL query. Defaults to null, use the result from the previous query.
</span><del>- * @param int $x Optional. Column of value to return. Indexed from 0.
- * @param int $y Optional. Row of value to return. Indexed from 0.
</del><ins>+ * @param int $x Optional. Column of value to return. Indexed from 0.
+ * @param int $y Optional. Row of value to return. Indexed from 0.
</ins><span class="cx"> * @return string|null Database query result (as string), or null on failure
</span><span class="cx"> */
</span><span class="cx"> function get_var( $query = null, $x = 0, $y = 0 ) {
</span><span class="lines">@@ -1365,7 +1365,7 @@
</span><span class="cx"> * @param string $query SQL query.
</span><span class="cx"> * @param string $output Optional. Any of ARRAY_A | ARRAY_N | OBJECT | OBJECT_K constants. With one of the first three, return an array of rows indexed from 0 by SQL result row number.
</span><span class="cx"> * Each row is an associative array (column => value, ...), a numerically indexed array (0 => value, ...), or an object. ( ->column = value ), respectively.
</span><del>- * With OBJECT_K, return an associative array of row objects keyed by the value of each row's first column's value. Duplicate keys are discarded.
</del><ins>+ * With OBJECT_K, return an associative array of row objects keyed by the value of each row's first column's value. Duplicate keys are discarded.
</ins><span class="cx"> * @return mixed Database query results
</span><span class="cx"> */
</span><span class="cx"> function get_results( $query = null, $output = OBJECT ) {
</span></span></pre></div>
<a id="trunkwpincludeswpdiffphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/wp-diff.php (19592 => 19593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/wp-diff.php 2011-12-12 22:25:58 UTC (rev 19592)
+++ trunk/wp-includes/wp-diff.php 2011-12-13 23:45:31 UTC (rev 19593)
</span><span class="lines">@@ -202,9 +202,9 @@
</span><span class="cx"> $r = '';
</span><span class="cx">
</span><span class="cx"> // Does the aforementioned additional processing
</span><del>- // *_matches tell what rows are "the same" in orig and final. Those pairs will be diffed to get word changes
</del><ins>+ // *_matches tell what rows are "the same" in orig and final. Those pairs will be diffed to get word changes
</ins><span class="cx"> // match is numeric: an index in other column
</span><del>- // match is 'X': no match. It is a new row
</del><ins>+ // match is 'X': no match. It is a new row
</ins><span class="cx"> // *_rows are column vectors for the orig column and the final column.
</span><span class="cx"> // row >= 0: an indix of the $orig or $final array
</span><span class="cx"> // row < 0: a blank row for that column
</span><span class="lines">@@ -231,7 +231,7 @@
</span><span class="cx"> $stripped_diff = strlen(strip_tags( $diff )) * 2 - $stripped_matches;
</span><span class="cx"> $diff_ratio = $stripped_matches / $stripped_diff;
</span><span class="cx"> if ( $diff_ratio > $this->_diff_threshold )
</span><del>- continue; // Too different. Don't save diffs.
</del><ins>+ continue; // Too different. Don't save diffs.
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Un-inline the diffs by removing del or ins
</span><span class="lines">@@ -241,11 +241,11 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> foreach ( array_keys($orig_rows) as $row ) {
</span><del>- // Both columns have blanks. Ignore them.
</del><ins>+ // Both columns have blanks. Ignore them.
</ins><span class="cx"> if ( $orig_rows[$row] < 0 && $final_rows[$row] < 0 )
</span><span class="cx"> continue;
</span><span class="cx">
</span><del>- // If we have a word based diff, use it. Otherwise, use the normal line.
</del><ins>+ // If we have a word based diff, use it. Otherwise, use the normal line.
</ins><span class="cx"> if ( isset( $orig_diffs[$orig_rows[$row]] ) )
</span><span class="cx"> $orig_line = $orig_diffs[$orig_rows[$row]];
</span><span class="cx"> elseif ( isset( $orig[$orig_rows[$row]] ) )
</span><span class="lines">@@ -260,9 +260,9 @@
</span><span class="cx"> else
</span><span class="cx"> $final_line = '';
</span><span class="cx">
</span><del>- if ( $orig_rows[$row] < 0 ) { // Orig is blank. This is really an added row.
</del><ins>+ if ( $orig_rows[$row] < 0 ) { // Orig is blank. This is really an added row.
</ins><span class="cx"> $r .= $this->_added( array($final_line), false );
</span><del>- } elseif ( $final_rows[$row] < 0 ) { // Final is blank. This is really a deleted row.
</del><ins>+ } elseif ( $final_rows[$row] < 0 ) { // Final is blank. This is really a deleted row.
</ins><span class="cx"> $r .= $this->_deleted( array($orig_line), false );
</span><span class="cx"> } else { // A true changed row.
</span><span class="cx"> $r .= '<tr>' . $this->deletedLine( $orig_line ) . $this->addedLine( $final_line ) . "</tr>\n";
</span><span class="lines">@@ -288,7 +288,7 @@
</span><span class="cx"> */
</span><span class="cx"> function interleave_changed_lines( $orig, $final ) {
</span><span class="cx">
</span><del>- // Contains all pairwise string comparisons. Keys are such that this need only be a one dimensional array.
</del><ins>+ // Contains all pairwise string comparisons. Keys are such that this need only be a one dimensional array.
</ins><span class="cx"> $matches = array();
</span><span class="cx"> foreach ( array_keys($orig) as $o ) {
</span><span class="cx"> foreach ( array_keys($final) as $f ) {
</span><span class="lines">@@ -309,7 +309,7 @@
</span><span class="cx"> if ( isset($orig_matches[$o]) && isset($final_matches[$f]) )
</span><span class="cx"> continue;
</span><span class="cx">
</span><del>- // First match for these guys. Must be best match
</del><ins>+ // First match for these guys. Must be best match
</ins><span class="cx"> if ( !isset($orig_matches[$o]) && !isset($final_matches[$f]) ) {
</span><span class="cx"> $orig_matches[$o] = $f;
</span><span class="cx"> $final_matches[$f] = $o;
</span><span class="lines">@@ -342,11 +342,11 @@
</span><span class="cx">
</span><span class="cx"> if ( false === $final_pos ) { // This orig is paired with a blank final.
</span><span class="cx"> array_splice( $final_rows, $orig_pos, 0, -1 );
</span><del>- } elseif ( $final_pos < $orig_pos ) { // This orig's match is up a ways. Pad final with blank rows.
</del><ins>+ } elseif ( $final_pos < $orig_pos ) { // This orig's match is up a ways. Pad final with blank rows.
</ins><span class="cx"> $diff_pos = $final_pos - $orig_pos;
</span><span class="cx"> while ( $diff_pos < 0 )
</span><span class="cx"> array_splice( $final_rows, $orig_pos, 0, $diff_pos++ );
</span><del>- } elseif ( $final_pos > $orig_pos ) { // This orig's match is down a ways. Pad orig with blank rows.
</del><ins>+ } elseif ( $final_pos > $orig_pos ) { // This orig's match is down a ways. Pad orig with blank rows.
</ins><span class="cx"> $diff_pos = $orig_pos - $final_pos;
</span><span class="cx"> while ( $diff_pos < 0 )
</span><span class="cx"> array_splice( $orig_rows, $orig_pos, 0, $diff_pos++ );
</span><span class="lines">@@ -427,7 +427,7 @@
</span><span class="cx"> // L1-norm of difference vector.
</span><span class="cx"> $difference = array_sum( array_map( array(&$this, 'difference'), $chars1, $chars2 ) );
</span><span class="cx">
</span><del>- // $string1 has zero length? Odd. Give huge penalty by not dividing.
</del><ins>+ // $string1 has zero length? Odd. Give huge penalty by not dividing.
</ins><span class="cx"> if ( !$string1 )
</span><span class="cx"> return $difference;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwploginphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-login.php (19592 => 19593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-login.php 2011-12-12 22:25:58 UTC (rev 19592)
+++ trunk/wp-login.php 2011-12-13 23:45:31 UTC (rev 19593)
</span><span class="lines">@@ -560,7 +560,7 @@
</span><span class="cx"> $reauth = empty($_REQUEST['reauth']) ? false : true;
</span><span class="cx">
</span><span class="cx"> // If the user was redirected to a secure login form from a non-secure admin page, and secure login is required but secure admin is not, then don't use a secure
</span><del>- // cookie and redirect back to the referring non-secure admin page. This allows logins to always be POSTed over SSL while allowing the user to choose visiting
</del><ins>+ // cookie and redirect back to the referring non-secure admin page. This allows logins to always be POSTed over SSL while allowing the user to choose visiting
</ins><span class="cx"> // the admin via http or https.
</span><span class="cx"> if ( !$secure_cookie && is_ssl() && force_ssl_login() && !force_ssl_admin() && ( 0 !== strpos($redirect_to, 'https') ) && ( 0 === strpos($redirect_to, 'http') ) )
</span><span class="cx"> $secure_cookie = false;
</span></span></pre></div>
<a id="trunkwpmailphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-mail.php (19592 => 19593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-mail.php 2011-12-12 22:25:58 UTC (rev 19592)
+++ trunk/wp-mail.php 2011-12-13 23:45:31 UTC (rev 19593)
</span><span class="lines">@@ -161,7 +161,7 @@
</span><span class="cx"> $user = new WP_User($post_author);
</span><span class="cx"> $post_status = ( $user->has_cap('publish_posts') ) ? 'publish' : 'pending';
</span><span class="cx"> } else {
</span><del>- // Author not found in DB, set status to pending. Author already set to admin.
</del><ins>+ // Author not found in DB, set status to pending. Author already set to admin.
</ins><span class="cx"> $post_status = 'pending';
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -226,7 +226,7 @@
</span><span class="cx"> $pop3->reset();
</span><span class="cx"> exit;
</span><span class="cx"> } else {
</span><del>- echo '<p>' . sprintf(__('Mission complete. Message <strong>%s</strong> deleted.'), $i) . '</p>';
</del><ins>+ echo '<p>' . sprintf(__('Mission complete. Message <strong>%s</strong> deleted.'), $i) . '</p>';
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpsignupphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-signup.php (19592 => 19593)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-signup.php 2011-12-12 22:25:58 UTC (rev 19592)
+++ trunk/wp-signup.php 2011-12-13 23:45:31 UTC (rev 19593)
</span><span class="lines">@@ -218,7 +218,7 @@
</span><span class="cx"> ?>
</span><span class="cx"> <h2><?php printf( __( 'The site %s is yours.' ), "<a href='http://{$domain}{$path}'>{$blog_title}</a>" ) ?></h2>
</span><span class="cx"> <p>
</span><del>- <?php printf( __( '<a href="http://%1$s">http://%2$s</a> is your new site. <a href="%3$s">Log in</a> as &#8220;%4$s&#8221; using your existing password.' ), $domain.$path, $domain.$path, "http://" . $domain.$path . "wp-login.php", $user_name ) ?>
</del><ins>+ <?php printf( __( '<a href="http://%1$s">http://%2$s</a> is your new site. <a href="%3$s">Log in</a> as &#8220;%4$s&#8221; using your existing password.' ), $domain.$path, $domain.$path, "http://" . $domain.$path . "wp-login.php", $user_name ) ?>
</ins><span class="cx"> </p>
</span><span class="cx"> <?php
</span><span class="cx"> do_action( 'signup_finished' );
</span></span></pre>
</div>
</div>
</body>
</html>