WordPress.org

Make WordPress Core

Changeset 12859


Ignore:
Timestamp:
01/26/2010 10:49:05 PM (8 years ago)
Author:
ryan
Message:

Remove trailing whitespace

Location:
trunk
Files:
12 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-admin/admin-ajax.php

    r12833 r12859  
    626626            $level++;
    627627        }
    628         $tag_full_name = esc_attr($tag_full_name); 
     628        $tag_full_name = esc_attr($tag_full_name);
    629629    }
    630630    echo _tag_row( $tag, $level, $tag_full_name, $taxonomy );
     
    11851185        die( __('Cheatin’ uh?') );
    11861186    $tax = get_taxonomy($taxonomy);
    1187        
     1187
    11881188    if ( ! current_user_can( $tax->edit_cap ) )
    11891189        die( __('Cheatin’ uh?') );
  • trunk/wp-admin/includes/plugin-install.php

    r12789 r12859  
    3535        $args->per_page = 24;
    3636
    37     // Allows a plugin to override the WordPress.org API entirely. 
     37    // Allows a plugin to override the WordPress.org API entirely.
    3838    // Use the filter 'plugins_api_result' to mearly add results.
    3939    // Please ensure that a object is returned from the following filters.
  • trunk/wp-admin/includes/plugin.php

    r12848 r12859  
    475475/**
    476476 * validate active plugins
    477  * 
    478  * validate all active plugins, deactivates invalid and 
     477 *
     478 * validate all active plugins, deactivates invalid and
    479479 * returns an array of deactived ones.
    480  * 
     480 *
    481481 * @since unknown
    482482 * @return array invalid plugins, plugin as key, error as value
  • trunk/wp-admin/includes/template.php

    r12833 r12859  
    674674function _tag_row( $tag, $level, $class = '', $taxonomy = 'post_tag' ) {
    675675        $count = number_format_i18n( $tag->count );
    676         if ( 'post_tag' == $taxonomy ) 
     676        if ( 'post_tag' == $taxonomy )
    677677            $tagsel = 'tag';
    678678        elseif ( 'category' == $taxonomy )
  • trunk/wp-admin/includes/theme.php

    r12789 r12859  
    152152    }
    153153    reset( $themes );
    154    
     154
    155155    return $themes;
    156156}
  • trunk/wp-admin/network.php

    r12830 r12859  
    4343    clearstatcache();
    4444    $files = array( "htaccess.dist", ".htaccess" );
    45    
     45
    4646    $indent = '    ';
    4747    foreach ( (array) $files as $val ) {
     
    105105    <h2><?php esc_html_e('Installing Network of WordPress Sites'); ?></h2>
    106106    <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>
    107    
     107
    108108    <h2><?php esc_html_e('What do I need?'); ?></h2>
    109109    <ul>
     
    114114    <?php
    115115    $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>';
    116    
     116
    117117    if ( function_exists( 'apache_get_modules' ) ) {
    118118        $modules = apache_get_modules();
     
    151151        <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>
    152152        <?php } ?>
    153         <table class="form-table"> 
    154             <tr> 
    155                 <th scope='row'><?php esc_html_e( 'Server Address' ); ?></th> 
     153        <table class="form-table">
     154            <tr>
     155                <th scope='row'><?php esc_html_e( 'Server Address' ); ?></th>
    156156                <td>
    157157                    <p><?php printf( __( 'This will be the Internet address of your site: <strong><em>%s</em></strong>.' ), $hostname ); ?></p>
    158158                    <input type='hidden' name='basedomain' value='<?php echo esc_attr( $hostname ); ?>' />
    159159                    <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>
    160                 </td> 
     160                </td>
    161161            </tr>
    162162        </table>
    163163
    164164        <h2><?php esc_html_e( 'Site Details' ); ?></h2>
    165         <table class="form-table"> 
    166             <tr> 
    167                 <th scope='row'><?php esc_html_e( 'Site&nbsp;Title' ); ?></th> 
     165        <table class="form-table">
     166            <tr>
     167                <th scope='row'><?php esc_html_e( 'Site&nbsp;Title' ); ?></th>
    168168                <td>
    169169                    <input name='weblog_title' type='text' size='45' value='<?php echo esc_attr( $weblog_title ); ?>' />
    170170                    <br /><?php _e( 'What would you like to call your site?' ); ?>
    171                 </td> 
    172             </tr> 
    173             <tr> 
    174                 <th scope='row'><?php esc_html_e( 'Email' ); ?></th> 
     171                </td>
     172            </tr>
     173            <tr>
     174                <th scope='row'><?php esc_html_e( 'Email' ); ?></th>
    175175                <td>
    176                     <input name='email' type='text' size='45' value='<?php echo esc_attr( $email ); ?>' /> 
     176                    <input name='email' type='text' size='45' value='<?php echo esc_attr( $email ); ?>' />
    177177                    <br /><?php _e( 'Your email address.' ); ?>
    178                 </td> 
    179             </tr> 
    180         </table> 
     178                </td>
     179            </tr>
     180        </table>
    181181        <p class='submit'><input class="button" name='submit' type='submit' value='<?php esc_attr_e( 'Proceed' ); ?>' /></p>
    182182    <?php
     
    272272}
    273273
    274 $action = isset($_POST[ 'action' ]) ? $_POST[ 'action' ] : null; 
     274$action = isset($_POST[ 'action' ]) ? $_POST[ 'action' ] : null;
    275275switch($action) {
    276276    case "step2":
    277277        check_admin_referer( 'install-network-1' );
    278        
     278
    279279        // Install!
    280280        $base = stripslashes( dirname( dirname($_SERVER["SCRIPT_NAME"]) ) );
  • trunk/wp-admin/revision.php

    r12751 r12859  
    127127if ( !$redirect ) {
    128128    if ( empty($post->post_type) ) // Empty post_type means either malformed object found, or no valid parent was found.
    129         $redirect = 'edit.php'; 
     129        $redirect = 'edit.php';
    130130    elseif ( !post_type_supports($post->post_type, 'revisions') )
    131131        $redirect = 'edit.php?post_type=' . $post->post_type;
  • trunk/wp-content/blogs.php

    r12603 r12859  
    102102
    103103// Support for Conditional GET
    104 if (isset($_SERVER['HTTP_IF_NONE_MATCH'])) 
     104if (isset($_SERVER['HTTP_IF_NONE_MATCH']))
    105105    $client_etag = stripslashes($_SERVER['HTTP_IF_NONE_MATCH']);
    106106else
     
    113113$client_modified_timestamp = $client_last_modified ? strtotime($client_last_modified) : 0;
    114114
    115 // Make a timestamp for our most recent modification... 
     115// Make a timestamp for our most recent modification...
    116116$modified_timestamp = strtotime($last_modified);
    117117
  • trunk/wp-includes/comment-template.php

    r12821 r12859  
    4141 * @since 0.71
    4242 * @uses apply_filters() Calls 'comment_author' on comment author before displaying
    43  * 
     43 *
    4444 * @param int $comment_ID The ID of the comment for which to print the author. Optional.
    4545 */
     
    857857    if ( empty($file) )
    858858        $file = '/comments.php';
    859    
     859
    860860    $req = get_option('require_name_email');
    861861
     
    14491449 * in the array of fields.
    14501450 *
    1451  * @since 3.0 
     1451 * @since 3.0
    14521452 * @param array $args Options for strings, fields etc in the form
    14531453 * @param mixed $post_id Post ID to generate the form for, uses the current post if null
     
    14561456function comment_form( $args = array(), $post_id = null ) {
    14571457    global $user_identity, $id;
    1458        
     1458
    14591459    if ( null === $post_id )
    14601460        $post_id = $id;
    14611461    else
    14621462        $id = $post_id;
    1463    
     1463
    14641464    $commenter = wp_get_current_commenter();
    1465    
     1465
    14661466    $req = get_option( 'require_name_email' );
    14671467    $aria_req = ( $req ? " aria-required='true'" : '' );
    14681468    $req_str  = ( $req ? __( ' (required)' ) : '' );
    1469     $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>', 
    1470                                                                                         '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>', 
     1469    $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>',
     1470                                                                                        '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>',
    14711471                                                                                        '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>' ) ),
    1472                         'comment_field' => '<p><textarea name="comment" id="comment" cols="58" rows="10" tabindex="4"></textarea></p>', 
    1473                         '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>', 
    1474                         '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 ) ) ) ), 
    1475                         'id_form' => 'commentform', 
    1476                         'id_submit' => 'submit', 
    1477                         'title_reply' => __( 'Leave a Reply' ), 
    1478                         'title_reply_to' => __( 'Leave a Reply to %s'), 
    1479                         'cancel_reply_link' => '', 
    1480                         'label_submit' => __( 'Submit Comment' ), 
     1472                        'comment_field' => '<p><textarea name="comment" id="comment" cols="58" rows="10" tabindex="4"></textarea></p>',
     1473                        '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>',
     1474                        '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 ) ) ) ),
     1475                        'id_form' => 'commentform',
     1476                        'id_submit' => 'submit',
     1477                        'title_reply' => __( 'Leave a Reply' ),
     1478                        'title_reply_to' => __( 'Leave a Reply to %s'),
     1479                        'cancel_reply_link' => '',
     1480                        'label_submit' => __( 'Submit Comment' ),
    14811481                );
    14821482    $args = wp_parse_args( $args, apply_filters( 'comment_form_defaults', $defaults ) );
    1483    
     1483
    14841484    ?>
    14851485        <?php if ( comments_open() ) : ?>
  • trunk/wp-includes/locale.php

    r12789 r12859  
    128128        }
    129129
    130         // Abbreviations for each day.     
     130        // Abbreviations for each day.
    131131        $this->weekday_abbrev[__('Sunday')]    = /* translators: three-letter abbreviation of the weekday */ __('Sun');
    132132        $this->weekday_abbrev[__('Monday')]    = /* translators: three-letter abbreviation of the weekday */ __('Mon');
  • trunk/wp-includes/meta.php

    r12761 r12859  
    33 * Metadata API
    44 *
    5  * Functions for retrieving and manipulating metadata of various WordPress object types.  Metadata 
    6  * for an object is a represented by a simple key-value pair.  Objects may contain multiple 
     5 * Functions for retrieving and manipulating metadata of various WordPress object types.  Metadata
     6 * for an object is a represented by a simple key-value pair.  Objects may contain multiple
    77 * metadata entries that share the same key and differ only in their value.
    88 *
     
    2424 * @param string $meta_key Metadata key
    2525 * @param string $meta_value Metadata value
    26  * @param bool $unique Optional, default is false.  Whether the specified metadata key should be 
    27  *      unique for the object.  If true, and the object already has a value for the specified 
     26 * @param bool $unique Optional, default is false.  Whether the specified metadata key should be
     27 *      unique for the object.  If true, and the object already has a value for the specified
    2828 *      metadata key, no change will be made
    2929 * @return bool True on successful update, false on failure.
     
    6464
    6565/**
    66  * Update metadata for the specified object.  If no value already exists for the specified object 
     66 * Update metadata for the specified object.  If no value already exists for the specified object
    6767 * ID and metadata key, the metadata will be added.
    6868 *
    6969 * @since 2.9.0
    7070 * @uses $wpdb WordPress database object for queries.
    71  * @uses do_action() Calls 'update_{$meta_type}_meta' before updating metadata with meta_id of 
     71 * @uses do_action() Calls 'update_{$meta_type}_meta' before updating metadata with meta_id of
    7272 *      metadata entry to update, object ID, meta key, and meta value
    73  * @uses do_action() Calls 'updated_{$meta_type}_meta' after updating metadata with meta_id of 
     73 * @uses do_action() Calls 'updated_{$meta_type}_meta' after updating metadata with meta_id of
    7474 *      updated metadata entry, object ID, meta key, and meta value
    7575 *
     
    7878 * @param string $meta_key Metadata key
    7979 * @param string $meta_value Metadata value
    80  * @param string $prev_value Optional.  If specified, only update existing metadata entries with 
     80 * @param string $prev_value Optional.  If specified, only update existing metadata entries with
    8181 *      the specified value.  Otherwise, update all entries.
    8282 * @return bool True on successful update, false on failure.
     
    125125 * @since 2.9.0
    126126 * @uses $wpdb WordPress database object for queries.
    127  * @uses do_action() Calls 'deleted_{$meta_type}_meta' after deleting with meta_id of 
     127 * @uses do_action() Calls 'deleted_{$meta_type}_meta' after deleting with meta_id of
    128128 *      deleted metadata entries, object ID, meta key, and meta value
    129129 *
     
    131131 * @param int $object_id ID of the object metadata is for
    132132 * @param string $meta_key Metadata key
    133  * @param string $meta_value Optional. Metadata value.  If specified, only delete metadata entries 
     133 * @param string $meta_value Optional. Metadata value.  If specified, only delete metadata entries
    134134 *      with this value.  Otherwise, delete all entries with the specified meta_key.
    135  * @param bool $delete_all Optional, default is false.  If true, delete matching metadata entries 
    136  *      for all objects, ignoring the specified object_id.  Otherwise, only delete matching 
     135 * @param bool $delete_all Optional, default is false.  If true, delete matching metadata entries
     136 *      for all objects, ignoring the specified object_id.  Otherwise, only delete matching
    137137 *      metadata entries for the specified object_id.
    138138 * @return bool True on successful delete, false on failure.
     
    186186 * @param string $meta_type Type of object metadata is for (e.g., comment, post, or user)
    187187 * @param int $object_id ID of the object metadata is for
    188  * @param string $meta_key Optional.  Metadata key.  If not specified, retrieve all metadata for 
     188 * @param string $meta_key Optional.  Metadata key.  If not specified, retrieve all metadata for
    189189 *      the specified object.
    190  * @param bool $single Optional, default is false.  If true, return only the first value of the 
     190 * @param bool $single Optional, default is false.  If true, return only the first value of the
    191191 *      specified meta_key.  This parameter has no effect if meta_key is not specified.
    192192 * @return string|array Single metadata value, or array of values
  • trunk/wp-login.php

    r12817 r12859  
    615615d = document.getElementById('user_pass');
    616616<?php } else { ?>
    617 d = document.getElementById('user_login'); 
     617d = document.getElementById('user_login');
    618618<?php } ?>
    619619d.value = '';
Note: See TracChangeset for help on using the changeset viewer.