<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[12859] trunk: Remove trailing whitespace</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12859">12859</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-01-26 22:49:05 +0000 (Tue, 26 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove trailing whitespace</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminadminajaxphp">trunk/wp-admin/admin-ajax.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="#trunkwpadminincludestemplatephp">trunk/wp-admin/includes/template.php</a></li>
<li><a href="#trunkwpadminincludesthemephp">trunk/wp-admin/includes/theme.php</a></li>
<li><a href="#trunkwpadminnetworkphp">trunk/wp-admin/network.php</a></li>
<li><a href="#trunkwpadminrevisionphp">trunk/wp-admin/revision.php</a></li>
<li><a href="#trunkwpcontentblogsphp">trunk/wp-content/blogs.php</a></li>
<li><a href="#trunkwpincludescommenttemplatephp">trunk/wp-includes/comment-template.php</a></li>
<li><a href="#trunkwpincludeslocalephp">trunk/wp-includes/locale.php</a></li>
<li><a href="#trunkwpincludesmetaphp">trunk/wp-includes/meta.php</a></li>
<li><a href="#trunkwploginphp">trunk/wp-login.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminadminajaxphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/admin-ajax.php (12858 => 12859)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/admin-ajax.php 2010-01-26 22:46:09 UTC (rev 12858)
+++ trunk/wp-admin/admin-ajax.php 2010-01-26 22:49:05 UTC (rev 12859)
</span><span class="lines">@@ -625,7 +625,7 @@
</span><span class="cx"> $tag_full_name = $_tag->name . ' &#8212; ' . $tag_full_name;
</span><span class="cx"> $level++;
</span><span class="cx"> }
</span><del>- $tag_full_name = esc_attr($tag_full_name);
</del><ins>+ $tag_full_name = esc_attr($tag_full_name);
</ins><span class="cx"> }
</span><span class="cx"> echo _tag_row( $tag, $level, $tag_full_name, $taxonomy );
</span><span class="cx"> exit;
</span><span class="lines">@@ -1184,7 +1184,7 @@
</span><span class="cx"> if ( ! $taxonomy )
</span><span class="cx"> die( __('Cheatin&#8217; uh?') );
</span><span class="cx"> $tax = get_taxonomy($taxonomy);
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( ! current_user_can( $tax->edit_cap ) )
</span><span class="cx"> die( __('Cheatin&#8217; uh?') );
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminincludesplugininstallphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/plugin-install.php (12858 => 12859)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/plugin-install.php 2010-01-26 22:46:09 UTC (rev 12858)
+++ trunk/wp-admin/includes/plugin-install.php 2010-01-26 22:49:05 UTC (rev 12859)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx"> if ( !isset($args->per_page) )
</span><span class="cx"> $args->per_page = 24;
</span><span class="cx">
</span><del>- // Allows a plugin to override the WordPress.org API entirely.
</del><ins>+ // Allows a plugin to override the WordPress.org API entirely.
</ins><span class="cx"> // Use the filter 'plugins_api_result' to mearly add results.
</span><span class="cx"> // Please ensure that a object is returned from the following filters.
</span><span class="cx"> $args = apply_filters('plugins_api_args', $args, $action);
</span></span></pre></div>
<a id="trunkwpadminincludespluginphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/plugin.php (12858 => 12859)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/plugin.php 2010-01-26 22:46:09 UTC (rev 12858)
+++ trunk/wp-admin/includes/plugin.php 2010-01-26 22:49:05 UTC (rev 12859)
</span><span class="lines">@@ -474,10 +474,10 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * validate active plugins
</span><del>- *
- * validate all active plugins, deactivates invalid and
</del><ins>+ *
+ * validate all active plugins, deactivates invalid and
</ins><span class="cx"> * returns an array of deactived ones.
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @since unknown
</span><span class="cx"> * @return array invalid plugins, plugin as key, error as value
</span><span class="cx"> */
</span></span></pre></div>
<a id="trunkwpadminincludestemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/template.php (12858 => 12859)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/template.php 2010-01-26 22:46:09 UTC (rev 12858)
+++ trunk/wp-admin/includes/template.php 2010-01-26 22:49:05 UTC (rev 12859)
</span><span class="lines">@@ -673,7 +673,7 @@
</span><span class="cx"> */
</span><span class="cx"> function _tag_row( $tag, $level, $class = '', $taxonomy = 'post_tag' ) {
</span><span class="cx"> $count = number_format_i18n( $tag->count );
</span><del>- if ( 'post_tag' == $taxonomy )
</del><ins>+ if ( 'post_tag' == $taxonomy )
</ins><span class="cx"> $tagsel = 'tag';
</span><span class="cx"> elseif ( 'category' == $taxonomy )
</span><span class="cx"> $tagsel = 'category_name';
</span></span></pre></div>
<a id="trunkwpadminincludesthemephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/theme.php (12858 => 12859)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/theme.php 2010-01-26 22:46:09 UTC (rev 12858)
+++ trunk/wp-admin/includes/theme.php 2010-01-26 22:49:05 UTC (rev 12859)
</span><span class="lines">@@ -151,7 +151,7 @@
</span><span class="cx"> unset( $themes[ $key ] );
</span><span class="cx"> }
</span><span class="cx"> reset( $themes );
</span><del>-
</del><ins>+
</ins><span class="cx"> return $themes;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminnetworkphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network.php (12858 => 12859)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network.php 2010-01-26 22:46:09 UTC (rev 12858)
+++ trunk/wp-admin/network.php 2010-01-26 22:49:05 UTC (rev 12859)
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx"> <?php
</span><span class="cx"> clearstatcache();
</span><span class="cx"> $files = array( "htaccess.dist", ".htaccess" );
</span><del>-
</del><ins>+
</ins><span class="cx"> $indent = '&nbsp;&nbsp;&nbsp;&nbsp;';
</span><span class="cx"> foreach ( (array) $files as $val ) {
</span><span class="cx"> $stats = @stat( $val );
</span><span class="lines">@@ -104,7 +104,7 @@
</span><span class="cx"> ?>
</span><span class="cx"> <h2><?php esc_html_e('Installing Network of WordPress Sites'); ?></h2>
</span><span class="cx"> <p><?php _e('I will help you enable the features for creating a network of sites by asking you a few questions so that you can create configuration files and make a directory to store all your uploaded files.'); ?></p>
</span><del>-
</del><ins>+
</ins><span class="cx"> <h2><?php esc_html_e('What do I need?'); ?></h2>
</span><span class="cx"> <ul>
</span><span class="cx"> <li><?php _e( 'Access to your server to change directory permissions. This can be done through ssh or ftp for example.' ); ?></li>
</span><span class="lines">@@ -113,7 +113,7 @@
</span><span class="cx"> </ul>
</span><span class="cx"> <?php
</span><span class="cx"> $mod_rewrite_msg = "\n<p>" . __( "If the <code>mod_rewrite</code> module is disabled ask your administrator to enable that module, or look at the <a href='http://httpd.apache.org/docs/mod/mod_rewrite.html'>Apache documentation</a> or <a href='http://www.google.com/search?q=apache+mod_rewrite'>elsewhere</a> for help setting it up." ) . '</p>';
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( function_exists( 'apache_get_modules' ) ) {
</span><span class="cx"> $modules = apache_get_modules();
</span><span class="cx"> if ( ! in_array( 'mod_rewrite', $modules ) )
</span><span class="lines">@@ -150,34 +150,34 @@
</span><span class="cx"> <?php if ( isset( $nowww ) ) { ?>
</span><span class="cx"> <h3><?php printf( __( 'We recommend you change your siteurl to <code>%1$s</code> before enabling the network feature. It will still be possible to visit your site using the "www" prefix with an address like <code>%2$s</code> but any links will not have the "www" prefix.' ), $nowww, $hostname ); ?></h3>
</span><span class="cx"> <?php } ?>
</span><del>- <table class="form-table">
- <tr>
- <th scope='row'><?php esc_html_e( 'Server Address' ); ?></th>
</del><ins>+ <table class="form-table">
+ <tr>
+ <th scope='row'><?php esc_html_e( 'Server Address' ); ?></th>
</ins><span class="cx"> <td>
</span><span class="cx"> <p><?php printf( __( 'This will be the Internet address of your site: <strong><em>%s</em></strong>.' ), $hostname ); ?></p>
</span><span class="cx"> <input type='hidden' name='basedomain' value='<?php echo esc_attr( $hostname ); ?>' />
</span><span class="cx"> <p><?php _e( 'Do not use an IP address (like 127.0.0.1) or a single word hostname like <q>localhost</q> as your server address.' ); ?></p>
</span><del>- </td>
</del><ins>+ </td>
</ins><span class="cx"> </tr>
</span><span class="cx"> </table>
</span><span class="cx">
</span><span class="cx"> <h2><?php esc_html_e( 'Site Details' ); ?></h2>
</span><del>- <table class="form-table">
- <tr>
- <th scope='row'><?php esc_html_e( 'Site&nbsp;Title' ); ?></th>
</del><ins>+ <table class="form-table">
+ <tr>
+ <th scope='row'><?php esc_html_e( 'Site&nbsp;Title' ); ?></th>
</ins><span class="cx"> <td>
</span><span class="cx"> <input name='weblog_title' type='text' size='45' value='<?php echo esc_attr( $weblog_title ); ?>' />
</span><span class="cx"> <br /><?php _e( 'What would you like to call your site?' ); ?>
</span><del>- </td>
- </tr>
- <tr>
- <th scope='row'><?php esc_html_e( 'Email' ); ?></th>
</del><ins>+ </td>
+ </tr>
+ <tr>
+ <th scope='row'><?php esc_html_e( 'Email' ); ?></th>
</ins><span class="cx"> <td>
</span><del>- <input name='email' type='text' size='45' value='<?php echo esc_attr( $email ); ?>' />
</del><ins>+ <input name='email' type='text' size='45' value='<?php echo esc_attr( $email ); ?>' />
</ins><span class="cx"> <br /><?php _e( 'Your email address.' ); ?>
</span><del>- </td>
- </tr>
- </table>
</del><ins>+ </td>
+ </tr>
+ </table>
</ins><span class="cx"> <p class='submit'><input class="button" name='submit' type='submit' value='<?php esc_attr_e( 'Proceed' ); ?>' /></p>
</span><span class="cx"> <?php
</span><span class="cx"> }
</span><span class="lines">@@ -271,11 +271,11 @@
</span><span class="cx"> return $domain;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-$action = isset($_POST[ 'action' ]) ? $_POST[ 'action' ] : null;
</del><ins>+$action = isset($_POST[ 'action' ]) ? $_POST[ 'action' ] : null;
</ins><span class="cx"> switch($action) {
</span><span class="cx"> case "step2":
</span><span class="cx"> check_admin_referer( 'install-network-1' );
</span><del>-
</del><ins>+
</ins><span class="cx"> // Install!
</span><span class="cx"> $base = stripslashes( dirname( dirname($_SERVER["SCRIPT_NAME"]) ) );
</span><span class="cx"> if( $base != "/")
</span></span></pre></div>
<a id="trunkwpadminrevisionphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/revision.php (12858 => 12859)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/revision.php 2010-01-26 22:46:09 UTC (rev 12858)
+++ trunk/wp-admin/revision.php 2010-01-26 22:49:05 UTC (rev 12859)
</span><span class="lines">@@ -126,7 +126,7 @@
</span><span class="cx">
</span><span class="cx"> if ( !$redirect ) {
</span><span class="cx"> if ( empty($post->post_type) ) // Empty post_type means either malformed object found, or no valid parent was found.
</span><del>- $redirect = 'edit.php';
</del><ins>+ $redirect = 'edit.php';
</ins><span class="cx"> elseif ( !post_type_supports($post->post_type, 'revisions') )
</span><span class="cx"> $redirect = 'edit.php?post_type=' . $post->post_type;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpcontentblogsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/blogs.php (12858 => 12859)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/blogs.php 2010-01-26 22:46:09 UTC (rev 12858)
+++ trunk/wp-content/blogs.php 2010-01-26 22:49:05 UTC (rev 12859)
</span><span class="lines">@@ -101,7 +101,7 @@
</span><span class="cx"> @header( 'Expires: ' . gmdate('D, d M Y H:i:s', time() + 100000000) . ' GMT' );
</span><span class="cx">
</span><span class="cx"> // Support for Conditional GET
</span><del>-if (isset($_SERVER['HTTP_IF_NONE_MATCH']))
</del><ins>+if (isset($_SERVER['HTTP_IF_NONE_MATCH']))
</ins><span class="cx"> $client_etag = stripslashes($_SERVER['HTTP_IF_NONE_MATCH']);
</span><span class="cx"> else
</span><span class="cx"> $client_etag = false;
</span><span class="lines">@@ -112,7 +112,7 @@
</span><span class="cx"> // If string is empty, return 0. If not, attempt to parse into a timestamp
</span><span class="cx"> $client_modified_timestamp = $client_last_modified ? strtotime($client_last_modified) : 0;
</span><span class="cx">
</span><del>-// Make a timestamp for our most recent modification...
</del><ins>+// Make a timestamp for our most recent modification...
</ins><span class="cx"> $modified_timestamp = strtotime($last_modified);
</span><span class="cx">
</span><span class="cx"> if ( ($client_last_modified && $client_etag) ?
</span></span></pre></div>
<a id="trunkwpincludescommenttemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/comment-template.php (12858 => 12859)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/comment-template.php 2010-01-26 22:46:09 UTC (rev 12858)
+++ trunk/wp-includes/comment-template.php 2010-01-26 22:49:05 UTC (rev 12859)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @since 0.71
</span><span class="cx"> * @uses apply_filters() Calls 'comment_author' on comment author before displaying
</span><del>- *
</del><ins>+ *
</ins><span class="cx"> * @param int $comment_ID The ID of the comment for which to print the author. Optional.
</span><span class="cx"> */
</span><span class="cx"> function comment_author( $comment_ID = 0 ) {
</span><span class="lines">@@ -856,7 +856,7 @@
</span><span class="cx">
</span><span class="cx"> if ( empty($file) )
</span><span class="cx"> $file = '/comments.php';
</span><del>-
</del><ins>+
</ins><span class="cx"> $req = get_option('require_name_email');
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -1448,39 +1448,39 @@
</span><span class="cx"> * a filter of the form comments_form_field_$name where $name is the key used
</span><span class="cx"> * in the array of fields.
</span><span class="cx"> *
</span><del>- * @since 3.0
</del><ins>+ * @since 3.0
</ins><span class="cx"> * @param array $args Options for strings, fields etc in the form
</span><span class="cx"> * @param mixed $post_id Post ID to generate the form for, uses the current post if null
</span><span class="cx"> * @return void
</span><span class="cx"> */
</span><span class="cx"> function comment_form( $args = array(), $post_id = null ) {
</span><span class="cx"> global $user_identity, $id;
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( null === $post_id )
</span><span class="cx"> $post_id = $id;
</span><span class="cx"> else
</span><span class="cx"> $id = $post_id;
</span><del>-
</del><ins>+
</ins><span class="cx"> $commenter = wp_get_current_commenter();
</span><del>-
</del><ins>+
</ins><span class="cx"> $req = get_option( 'require_name_email' );
</span><span class="cx"> $aria_req = ( $req ? " aria-required='true'" : '' );
</span><span class="cx"> $req_str = ( $req ? __( ' (required)' ) : '' );
</span><del>- $defaults = array( 'fields' => apply_filters( 'comment_form_default_fields', array( 'author' => '<p><input type="text" name="author" id="author" value="' . esc_attr( $commenter['comment_author'] ) . '" size="22" tabindex="1"' . $aria_req . ' /> <label for="author"><small>' . __( 'Name' ) . $req_str . '</small></label></p>',
- 'email' => '<p><input type="text" name="email" id="email" value="' . esc_attr( $commenter['comment_author_email'] ) . '" size="22" tabindex="2"' . $aria_req . ' /> <label for="email"><small>' . __( 'Mail (will not be published)' ) . $req_str . '</small></label></p>',
</del><ins>+ $defaults = array( 'fields' => apply_filters( 'comment_form_default_fields', array( 'author' => '<p><input type="text" name="author" id="author" value="' . esc_attr( $commenter['comment_author'] ) . '" size="22" tabindex="1"' . $aria_req . ' /> <label for="author"><small>' . __( 'Name' ) . $req_str . '</small></label></p>',
+ 'email' => '<p><input type="text" name="email" id="email" value="' . esc_attr( $commenter['comment_author_email'] ) . '" size="22" tabindex="2"' . $aria_req . ' /> <label for="email"><small>' . __( 'Mail (will not be published)' ) . $req_str . '</small></label></p>',
</ins><span class="cx"> 'url' => '<p><input type="text" name="url" id="url" value="' . esc_attr( $commenter['comment_author_url'] ) . '" size="22" tabindex="3" /> <label for="url"><small>' . __( 'Website' ) . '</small></label></p>' ) ),
</span><del>- 'comment_field' => '<p><textarea name="comment" id="comment" cols="58" rows="10" tabindex="4"></textarea></p>',
- 'must_log_in' => '<p>' . 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>',
- 'logged_in_as' => '<p>' . sprintf( __( 'Logged in as <a href="%s">%s</a>. <a href="%s" title="Log out of this account">Log out &raquo;</a></p>' ), admin_url( 'profile.php' ), $user_identity, wp_logout_url( apply_filters( 'the_permalink', get_permalink( $post_id ) ) ) ),
- 'id_form' => 'commentform',
- 'id_submit' => 'submit',
- 'title_reply' => __( 'Leave a Reply' ),
- 'title_reply_to' => __( 'Leave a Reply to %s'),
- 'cancel_reply_link' => '',
- 'label_submit' => __( 'Submit Comment' ),
</del><ins>+ 'comment_field' => '<p><textarea name="comment" id="comment" cols="58" rows="10" tabindex="4"></textarea></p>',
+ 'must_log_in' => '<p>' . 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>',
+ 'logged_in_as' => '<p>' . sprintf( __( 'Logged in as <a href="%s">%s</a>. <a href="%s" title="Log out of this account">Log out &raquo;</a></p>' ), admin_url( 'profile.php' ), $user_identity, wp_logout_url( apply_filters( 'the_permalink', get_permalink( $post_id ) ) ) ),
+ 'id_form' => 'commentform',
+ 'id_submit' => 'submit',
+ 'title_reply' => __( 'Leave a Reply' ),
+ 'title_reply_to' => __( 'Leave a Reply to %s'),
+ 'cancel_reply_link' => '',
+ 'label_submit' => __( 'Submit Comment' ),
</ins><span class="cx"> );
</span><span class="cx"> $args = wp_parse_args( $args, apply_filters( 'comment_form_defaults', $defaults ) );
</span><del>-
</del><ins>+
</ins><span class="cx"> ?>
</span><span class="cx"> <?php if ( comments_open() ) : ?>
</span><span class="cx"> <?php do_action( 'comment_form_before' ); ?>
</span></span></pre></div>
<a id="trunkwpincludeslocalephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/locale.php (12858 => 12859)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/locale.php 2010-01-26 22:46:09 UTC (rev 12858)
+++ trunk/wp-includes/locale.php 2010-01-26 22:49:05 UTC (rev 12859)
</span><span class="lines">@@ -127,7 +127,7 @@
</span><span class="cx"> $this->weekday_initial[$weekday_] = preg_replace('/_.+_initial$/', '', $weekday_initial_);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // Abbreviations for each day.
</del><ins>+ // Abbreviations for each day.
</ins><span class="cx"> $this->weekday_abbrev[__('Sunday')] = /* translators: three-letter abbreviation of the weekday */ __('Sun');
</span><span class="cx"> $this->weekday_abbrev[__('Monday')] = /* translators: three-letter abbreviation of the weekday */ __('Mon');
</span><span class="cx"> $this->weekday_abbrev[__('Tuesday')] = /* translators: three-letter abbreviation of the weekday */ __('Tue');
</span></span></pre></div>
<a id="trunkwpincludesmetaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/meta.php (12858 => 12859)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/meta.php 2010-01-26 22:46:09 UTC (rev 12858)
+++ trunk/wp-includes/meta.php 2010-01-26 22:49:05 UTC (rev 12859)
</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 True on successful update, false on failure.
</span><span class="cx"> */
</span><span class="lines">@@ -63,21 +63,21 @@
</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="cx"> * @uses $wpdb WordPress database object for queries.
</span><del>- * @uses do_action() Calls 'update_{$meta_type}_meta' before updating metadata with meta_id of
</del><ins>+ * @uses do_action() Calls 'update_{$meta_type}_meta' before updating metadata with meta_id of
</ins><span class="cx"> * metadata entry to update, object ID, meta key, and meta value
</span><del>- * @uses do_action() Calls 'updated_{$meta_type}_meta' after updating metadata with meta_id of
</del><ins>+ * @uses do_action() Calls 'updated_{$meta_type}_meta' after updating metadata with meta_id of
</ins><span class="cx"> * updated metadata entry, object ID, meta key, and meta value
</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><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
</del><ins>+ * @param string $prev_value Optional. If specified, only update existing metadata entries with
</ins><span class="cx"> * the specified value. Otherwise, update all entries.
</span><span class="cx"> * @return bool True on successful update, false on failure.
</span><span class="cx"> */
</span><span class="lines">@@ -124,16 +124,16 @@
</span><span class="cx"> *
</span><span class="cx"> * @since 2.9.0
</span><span class="cx"> * @uses $wpdb WordPress database object for queries.
</span><del>- * @uses do_action() Calls 'deleted_{$meta_type}_meta' after deleting with meta_id of
</del><ins>+ * @uses do_action() Calls 'deleted_{$meta_type}_meta' after deleting with meta_id of
</ins><span class="cx"> * deleted metadata entries, object ID, meta key, and meta value
</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><span class="cx"> * @param string $meta_key Metadata key
</span><del>- * @param string $meta_value Optional. Metadata value. If specified, only delete metadata entries
</del><ins>+ * @param string $meta_value Optional. Metadata value. If specified, only delete metadata entries
</ins><span class="cx"> * with this value. Otherwise, delete all entries with the specified meta_key.
</span><del>- * @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 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">@@ -185,9 +185,9 @@
</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
</del><ins>+ * @param bool $single Optional, default is false. If true, return only the first value of the
</ins><span class="cx"> * specified meta_key. This parameter has no effect if meta_key is not specified.
</span><span class="cx"> * @return string|array Single metadata value, or array of values
</span><span class="cx"> */
</span></span></pre></div>
<a id="trunkwploginphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-login.php (12858 => 12859)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-login.php 2010-01-26 22:46:09 UTC (rev 12858)
+++ trunk/wp-login.php 2010-01-26 22:49:05 UTC (rev 12859)
</span><span class="lines">@@ -614,7 +614,7 @@
</span><span class="cx"> <?php if ( $user_login || $interim_login ) { ?>
</span><span class="cx"> d = document.getElementById('user_pass');
</span><span class="cx"> <?php } else { ?>
</span><del>-d = document.getElementById('user_login');
</del><ins>+d = document.getElementById('user_login');
</ins><span class="cx"> <?php } ?>
</span><span class="cx"> d.value = '';
</span><span class="cx"> d.focus();
</span></span></pre>
</div>
</div>
</body>
</html>