Upstream
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove trailing whitespace 

git-svn-id: http://svn.automattic.com/wordpress/trunk@12859 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2010-01-26 22:49:05 +00:00
parent cd57004569
commit 699387f747
12 changed files with 65 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-admin/admin-ajax.php
View File

@ -625,7 +625,7 @@ case 'add-tag' : // From Manage->Tags
$tag_full_name = $_tag->name . ' — ' . $tag_full_name;
$level++;
}
$tag_full_name = esc_attr($tag_full_name);
$tag_full_name = esc_attr($tag_full_name);
}
echo _tag_row( $tag, $level, $tag_full_name, $taxonomy );
exit;
@ -1184,7 +1184,7 @@ case 'inline-save-tax':
if ( ! $taxonomy )
die( __('Cheatin’ uh?') );
$tax = get_taxonomy($taxonomy);
if ( ! current_user_can( $tax->edit_cap ) )
die( __('Cheatin’ uh?') );

2
wp-admin/includes/plugin-install.php
View File

@ -34,7 +34,7 @@ function plugins_api($action, $args = null) {
if ( !isset($args->per_page) )
$args->per_page = 24;
// Allows a plugin to override the WordPress.org API entirely.
// Allows a plugin to override the WordPress.org API entirely.
// Use the filter 'plugins_api_result' to mearly add results.
// Please ensure that a object is returned from the following filters.
$args = apply_filters('plugins_api_args', $args, $action);

6
wp-admin/includes/plugin.php
View File

@ -474,10 +474,10 @@ function delete_plugins($plugins, $redirect = '' ) {
/**
* validate active plugins
*
* validate all active plugins, deactivates invalid and
*
* validate all active plugins, deactivates invalid and
* returns an array of deactived ones.
*
*
* @since unknown
* @return array invalid plugins, plugin as key, error as value
*/

2
wp-admin/includes/template.php
View File

@ -673,7 +673,7 @@ function wp_link_category_checklist( $link_id = 0 ) {
*/
function _tag_row( $tag, $level, $class = '', $taxonomy = 'post_tag' ) {
$count = number_format_i18n( $tag->count );
if ( 'post_tag' == $taxonomy )
if ( 'post_tag' == $taxonomy )
$tagsel = 'tag';
elseif ( 'category' == $taxonomy )
$tagsel = 'category_name';

2
wp-admin/includes/theme.php
View File

@ -151,7 +151,7 @@ function get_allowed_themes() {
unset( $themes[ $key ] );
}
reset( $themes );
return $themes;
}

40
wp-admin/network.php
View File

@ -42,7 +42,7 @@ function filestats( $err ) {
<?php
clearstatcache();
$files = array( "htaccess.dist", ".htaccess" );
$indent = '&nbsp;&nbsp;&nbsp;&nbsp;';
foreach ( (array) $files as $val ) {
$stats = @stat( $val );
@ -104,7 +104,7 @@ function step1() {
?>
<h2><?php esc_html_e('Installing Network of WordPress Sites'); ?></h2>
<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>
<h2><?php esc_html_e('What do I need?'); ?></h2>
<ul>
<li><?php _e( 'Access to your server to change directory permissions. This can be done through ssh or ftp for example.' ); ?></li>
@ -113,7 +113,7 @@ function step1() {
</ul>
<?php
$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>';
if ( function_exists( 'apache_get_modules' ) ) {
$modules = apache_get_modules();
if ( ! in_array( 'mod_rewrite', $modules ) )
@ -150,34 +150,34 @@ function printstep1form( $rewrite_enabled = false ) {
<?php if ( isset( $nowww ) ) { ?>
<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>
<?php } ?>
<table class="form-table">
<tr>
<th scope='row'><?php esc_html_e( 'Server Address' ); ?></th>
<table class="form-table">
<tr>
<th scope='row'><?php esc_html_e( 'Server Address' ); ?></th>
<td>
<p><?php printf( __( 'This will be the Internet address of your site: <strong><em>%s</em></strong>.' ), $hostname ); ?></p>
<input type='hidden' name='basedomain' value='<?php echo esc_attr( $hostname ); ?>' />
<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>
</td>
</td>
</tr>
</table>
<h2><?php esc_html_e( 'Site Details' ); ?></h2>
<table class="form-table">
<tr>
<th scope='row'><?php esc_html_e( 'Site&nbsp;Title' ); ?></th>
<table class="form-table">
<tr>
<th scope='row'><?php esc_html_e( 'Site&nbsp;Title' ); ?></th>
<td>
<input name='weblog_title' type='text' size='45' value='<?php echo esc_attr( $weblog_title ); ?>' />
<br /><?php _e( 'What would you like to call your site?' ); ?>
</td>
</tr>
<tr>
<th scope='row'><?php esc_html_e( 'Email' ); ?></th>
</td>
</tr>
<tr>
<th scope='row'><?php esc_html_e( 'Email' ); ?></th>
<td>
<input name='email' type='text' size='45' value='<?php echo esc_attr( $email ); ?>' />
<input name='email' type='text' size='45' value='<?php echo esc_attr( $email ); ?>' />
<br /><?php _e( 'Your email address.' ); ?>
</td>
</tr>
</table>
</td>
</tr>
</table>
<p class='submit'><input class="button" name='submit' type='submit' value='<?php esc_attr_e( 'Proceed' ); ?>' /></p>
<?php
}
@ -271,11 +271,11 @@ function get_clean_basedomain() {
return $domain;
}
$action = isset($_POST[ 'action' ]) ? $_POST[ 'action' ] : null;
$action = isset($_POST[ 'action' ]) ? $_POST[ 'action' ] : null;
switch($action) {
case "step2":
check_admin_referer( 'install-network-1' );
// Install!
$base = stripslashes( dirname( dirname($_SERVER["SCRIPT_NAME"]) ) );
if( $base != "/")

2
wp-admin/revision.php
View File

@ -126,7 +126,7 @@ endswitch;
if ( !$redirect ) {
if ( empty($post->post_type) ) // Empty post_type means either malformed object found, or no valid parent was found.
$redirect = 'edit.php';
$redirect = 'edit.php';
elseif ( !post_type_supports($post->post_type, 'revisions') )
$redirect = 'edit.php?post_type=' . $post->post_type;
}

4
wp-content/blogs.php
View File

@ -101,7 +101,7 @@ $etag = '"' . md5($last_modified) . '"';
@header( 'Expires: ' . gmdate('D, d M Y H:i:s', time() + 100000000) . ' GMT' );
// Support for Conditional GET
if (isset($_SERVER['HTTP_IF_NONE_MATCH']))
if (isset($_SERVER['HTTP_IF_NONE_MATCH']))
$client_etag = stripslashes($_SERVER['HTTP_IF_NONE_MATCH']);
else
$client_etag = false;
@ -112,7 +112,7 @@ $client_last_modified = trim( $_SERVER['HTTP_IF_MODIFIED_SINCE']);
// If string is empty, return 0. If not, attempt to parse into a timestamp
$client_modified_timestamp = $client_last_modified ? strtotime($client_last_modified) : 0;
// Make a timestamp for our most recent modification...
// Make a timestamp for our most recent modification...
$modified_timestamp = strtotime($last_modified);
if ( ($client_last_modified && $client_etag) ?

36
wp-includes/comment-template.php
View File

@ -40,7 +40,7 @@ function get_comment_author( $comment_ID = 0 ) {
*
* @since 0.71
* @uses apply_filters() Calls 'comment_author' on comment author before displaying
*
*
* @param int $comment_ID The ID of the comment for which to print the author. Optional.
*/
function comment_author( $comment_ID = 0 ) {
@ -856,7 +856,7 @@ function comments_template( $file = '/comments.php', $separate_comments = false
if ( empty($file) )
$file = '/comments.php';
$req = get_option('require_name_email');
/**
@ -1448,39 +1448,39 @@ function wp_list_comments($args = array(), $comments = null ) {
* a filter of the form comments_form_field_$name where $name is the key used
* in the array of fields.
*
* @since 3.0
* @since 3.0
* @param array $args Options for strings, fields etc in the form
* @param mixed $post_id Post ID to generate the form for, uses the current post if null
* @return void
*/
function comment_form( $args = array(), $post_id = null ) {
global $user_identity, $id;
if ( null === $post_id )
$post_id = $id;
else
$id = $post_id;
$commenter = wp_get_current_commenter();
$req = get_option( 'require_name_email' );
$aria_req = ( $req ? " aria-required='true'" : '' );
$req_str = ( $req ? __( ' (required)' ) : '' );
$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>',
$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>',
'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>' ) ),
'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' ),
'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' ),
);
$args = wp_parse_args( $args, apply_filters( 'comment_form_defaults', $defaults ) );
?>
<?php if ( comments_open() ) : ?>
<?php do_action( 'comment_form_before' ); ?>

2
wp-includes/locale.php
View File

@ -127,7 +127,7 @@ class WP_Locale {
$this->weekday_initial[$weekday_] = preg_replace('/_.+_initial$/', '', $weekday_initial_);
}
// Abbreviations for each day.
// Abbreviations for each day.
$this->weekday_abbrev[__('Sunday')] = /* translators: three-letter abbreviation of the weekday */ __('Sun');
$this->weekday_abbrev[__('Monday')] = /* translators: three-letter abbreviation of the weekday */ __('Mon');
$this->weekday_abbrev[__('Tuesday')] = /* translators: three-letter abbreviation of the weekday */ __('Tue');

28
wp-includes/meta.php
View File

@ -2,8 +2,8 @@
/**
* Metadata API
*
* 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
* 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
* metadata entries that share the same key and differ only in their value.
*
* @package WordPress
@ -23,8 +23,8 @@
* @param int $object_id ID of the object metadata is for
* @param string $meta_key Metadata key
* @param string $meta_value Metadata value
* @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
* @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
* metadata key, no change will be made
* @return bool True on successful update, false on failure.
*/
@ -63,21 +63,21 @@ function add_metadata($meta_type, $object_id, $meta_key, $meta_value, $unique =
}
/**
* Update metadata for the specified object. If no value already exists for the specified object
* Update metadata for the specified object. If no value already exists for the specified object
* ID and metadata key, the metadata will be added.
*
* @since 2.9.0
* @uses $wpdb WordPress database object for queries.
* @uses do_action() Calls 'update_{$meta_type}_meta' before updating metadata with meta_id of
* @uses do_action() Calls 'update_{$meta_type}_meta' before updating metadata with meta_id of
* metadata entry to update, object ID, meta key, and meta value
* @uses do_action() Calls 'updated_{$meta_type}_meta' after updating metadata with meta_id of
* @uses do_action() Calls 'updated_{$meta_type}_meta' after updating metadata with meta_id of
* updated metadata entry, object ID, meta key, and meta value
*
* @param string $meta_type Type of object metadata is for (e.g., comment, post, or user)
* @param int $object_id ID of the object metadata is for
* @param string $meta_key Metadata key
* @param string $meta_value Metadata value
* @param string $prev_value Optional. If specified, only update existing metadata entries with
* @param string $prev_value Optional. If specified, only update existing metadata entries with
* the specified value. Otherwise, update all entries.
* @return bool True on successful update, false on failure.
*/
@ -124,16 +124,16 @@ function update_metadata($meta_type, $object_id, $meta_key, $meta_value, $prev_v
*
* @since 2.9.0
* @uses $wpdb WordPress database object for queries.
* @uses do_action() Calls 'deleted_{$meta_type}_meta' after deleting with meta_id of
* @uses do_action() Calls 'deleted_{$meta_type}_meta' after deleting with meta_id of
* deleted metadata entries, object ID, meta key, and meta value
*
* @param string $meta_type Type of object metadata is for (e.g., comment, post, or user)
* @param int $object_id ID of the object metadata is for
* @param string $meta_key Metadata key
* @param string $meta_value Optional. Metadata value. If specified, only delete metadata entries
* @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
* @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
* metadata entries for the specified object_id.
* @return bool True on successful delete, false on failure.
*/
@ -185,9 +185,9 @@ function delete_metadata($meta_type, $object_id, $meta_key, $meta_value = '', $d
*
* @param string $meta_type Type of object metadata is for (e.g., comment, post, or user)
* @param int $object_id ID of the object metadata is for
* @param string $meta_key Optional. Metadata key. If not specified, retrieve all metadata for
* @param string $meta_key Optional. Metadata key. If not specified, retrieve all metadata for
* the specified object.
* @param bool $single Optional, default is false. If true, return only the first value of the
* @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.
* @return string|array Single metadata value, or array of values
*/

2
wp-login.php
View File

@ -614,7 +614,7 @@ setTimeout( function(){ try{
<?php if ( $user_login || $interim_login ) { ?>
d = document.getElementById('user_pass');
<?php } else { ?>
d = document.getElementById('user_login');
d = document.getElementById('user_login');
<?php } ?>
d.value = '';
d.focus();