From 699387f747dd02850ec57569d9087cc9b9541ceb Mon Sep 17 00:00:00 2001 From: ryan Date: Tue, 26 Jan 2010 22:49:05 +0000 Subject: [PATCH] Remove trailing whitespace git-svn-id: http://svn.automattic.com/wordpress/trunk@12859 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/admin-ajax.php | 4 +-- wp-admin/includes/plugin-install.php | 2 +- wp-admin/includes/plugin.php | 6 ++--- wp-admin/includes/template.php | 2 +- wp-admin/includes/theme.php | 2 +- wp-admin/network.php | 40 ++++++++++++++-------------- wp-admin/revision.php | 2 +- wp-content/blogs.php | 4 +-- wp-includes/comment-template.php | 36 ++++++++++++------------- wp-includes/locale.php | 2 +- wp-includes/meta.php | 28 +++++++++---------- wp-login.php | 2 +- 12 files changed, 65 insertions(+), 65 deletions(-) diff --git a/wp-admin/admin-ajax.php b/wp-admin/admin-ajax.php index b3f00c1979..7976c69253 100644 --- a/wp-admin/admin-ajax.php +++ b/wp-admin/admin-ajax.php @@ -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?') ); diff --git a/wp-admin/includes/plugin-install.php b/wp-admin/includes/plugin-install.php index f01fad46c3..1861c587fc 100644 --- a/wp-admin/includes/plugin-install.php +++ b/wp-admin/includes/plugin-install.php @@ -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); diff --git a/wp-admin/includes/plugin.php b/wp-admin/includes/plugin.php index 07e721117f..e10f9d68af 100644 --- a/wp-admin/includes/plugin.php +++ b/wp-admin/includes/plugin.php @@ -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 */ diff --git a/wp-admin/includes/template.php b/wp-admin/includes/template.php index e80ad36c7b..bc631cede7 100644 --- a/wp-admin/includes/template.php +++ b/wp-admin/includes/template.php @@ -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'; diff --git a/wp-admin/includes/theme.php b/wp-admin/includes/theme.php index a6bfe3d8ad..56a4241b24 100644 --- a/wp-admin/includes/theme.php +++ b/wp-admin/includes/theme.php @@ -151,7 +151,7 @@ function get_allowed_themes() { unset( $themes[ $key ] ); } reset( $themes ); - + return $themes; } diff --git a/wp-admin/network.php b/wp-admin/network.php index 8846b4063d..31ba4208c9 100644 --- a/wp-admin/network.php +++ b/wp-admin/network.php @@ -42,7 +42,7 @@ function filestats( $err ) {

- +

" . __( "If the mod_rewrite module is disabled ask your administrator to enable that module, or look at the Apache documentation or elsewhere for help setting it up." ) . '

'; - + 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 ) {

%1$s before enabling the network feature. It will still be possible to visit your site using the "www" prefix with an address like %2$s but any links will not have the "www" prefix.' ), $nowww, $hostname ); ?>

- - - +
+ + +

%s.' ), $hostname ); ?>

localhost as your server address.' ); ?>

-

- - - +
+ + - - - + + + + - -

-
- +
-
+ + +

' />

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; } diff --git a/wp-content/blogs.php b/wp-content/blogs.php index 70afdc1d72..4e16b9afea 100755 --- a/wp-content/blogs.php +++ b/wp-content/blogs.php @@ -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) ? diff --git a/wp-includes/comment-template.php b/wp-includes/comment-template.php index 12f892039c..42d1354f56 100644 --- a/wp-includes/comment-template.php +++ b/wp-includes/comment-template.php @@ -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' => '

', - 'email' => '

', + $defaults = array( 'fields' => apply_filters( 'comment_form_default_fields', array( 'author' => '

', + 'email' => '

', 'url' => '

' ) ), - 'comment_field' => '

', - 'must_log_in' => '

' . sprintf( __( 'You must be logged in to post a comment.' ), wp_login_url( apply_filters( 'the_permalink', get_permalink( $post_id ) ) ) ) . '

', - 'logged_in_as' => '

' . sprintf( __( 'Logged in as %s. Log out »

' ), 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' => '

', + 'must_log_in' => '

' . sprintf( __( 'You must be logged in to post a comment.' ), wp_login_url( apply_filters( 'the_permalink', get_permalink( $post_id ) ) ) ) . '

', + 'logged_in_as' => '

' . sprintf( __( 'Logged in as %s. Log out »

' ), 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 ) ); - + ?> diff --git a/wp-includes/locale.php b/wp-includes/locale.php index 2be540113d..630e30d3c0 100644 --- a/wp-includes/locale.php +++ b/wp-includes/locale.php @@ -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'); diff --git a/wp-includes/meta.php b/wp-includes/meta.php index 103429e30f..25fb826c85 100644 --- a/wp-includes/meta.php +++ b/wp-includes/meta.php @@ -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 */ diff --git a/wp-login.php b/wp-login.php index f64518dfdf..1f98a5709a 100644 --- a/wp-login.php +++ b/wp-login.php @@ -614,7 +614,7 @@ setTimeout( function(){ try{ d = document.getElementById('user_pass'); -d = document.getElementById('user_login'); +d = document.getElementById('user_login'); d.value = ''; d.focus();