WordPress.org

Make WordPress Core

Changeset 19593


Ignore:
Timestamp:
12/13/11 23:45:31 (3 years ago)
Author:
ryan
Message:

Use one space, not two, after trailing punctuation. fixes #19537

Location:
trunk
Files:
88 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-activate.php

    r19027 r19593  
    6464                echo '<p class="lead-in">'; 
    6565                if ( $signup->domain . $signup->path == '' ) { 
    66                     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() ); 
     66                    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() ); 
    6767                } else { 
    68                     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() ); 
     68                    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() ); 
    6969                } 
    7070                echo '</p>'; 
  • trunk/wp-admin/admin-ajax.php

    r19420 r19593  
    971971        if ( 'auto-draft' == $post->post_status || 'draft' == $post->post_status ) { 
    972972            $id = edit_post(); 
    973         } else { // Non drafts are not overwritten.  The autosave is stored in a special post revision. 
     973        } else { // Non drafts are not overwritten. The autosave is stored in a special post revision. 
    974974            $revision_id = wp_create_post_autosave( $post->ID ); 
    975975            if ( is_wp_error($revision_id) ) 
  • trunk/wp-admin/custom-header.php

    r19515 r19593  
    677677            $image = wp_crop_image($file, 0, 0, $width, $height, HEADER_IMAGE_WIDTH, $height / $oitar, false, str_replace(basename($file), 'midsize-'.basename($file), $file)); 
    678678            if ( is_wp_error( $image ) ) 
    679                 wp_die( __( 'Image could not be processed.  Please go back and try again.' ), __( 'Image Processing Error' ) ); 
     679                wp_die( __( 'Image could not be processed. Please go back and try again.' ), __( 'Image Processing Error' ) ); 
    680680 
    681681            $image = apply_filters('wp_create_file_in_uploads', $image, $id); // For replication 
     
    738738        $cropped = wp_crop_image( $attachment_id, (int) $_POST['x1'], (int) $_POST['y1'], (int) $_POST['width'], (int) $_POST['height'], HEADER_IMAGE_WIDTH, HEADER_IMAGE_HEIGHT ); 
    739739        if ( is_wp_error( $cropped ) ) 
    740             wp_die( __( 'Image could not be processed.  Please go back and try again.' ), __( 'Image Processing Error' ) ); 
     740            wp_die( __( 'Image could not be processed. Please go back and try again.' ), __( 'Image Processing Error' ) ); 
    741741 
    742742        $cropped = apply_filters('wp_create_file_in_uploads', $cropped, $attachment_id); // For replication 
  • trunk/wp-admin/edit-form-advanced.php

    r19475 r19593  
    8888    foreach ( _wp_post_revision_fields() as $autosave_field => $_autosave_field ) { 
    8989        if ( normalize_whitespace( $autosave->$autosave_field ) != normalize_whitespace( $post->$autosave_field ) ) { 
    90             $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 ) ); 
     90            $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 ) ); 
    9191            break; 
    9292        } 
  • trunk/wp-admin/edit-tags.php

    r19528 r19593  
    8181 
    8282    $tag_ID = (int) $_REQUEST['tag_ID']; 
    83     check_admin_referer( 'delete-tag_' .  $tag_ID ); 
     83    check_admin_referer( 'delete-tag_' . $tag_ID ); 
    8484 
    8585    if ( !current_user_can( $tax->cap->delete_terms ) ) 
  • trunk/wp-admin/import.php

    r19509 r19593  
    2121    'title'   => __('Overview'), 
    2222    '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>' . 
    23         '<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>', 
     23        '<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>', 
    2424) ); 
    2525 
  • trunk/wp-admin/includes/class-wp-filesystem-direct.php

    r18964 r19593  
    208208            return false; 
    209209 
    210         // try using rename first.  if that fails (for example, source is read only) try copy 
     210        // try using rename first. if that fails (for example, source is read only) try copy 
    211211        if ( @rename($source, $destination) ) 
    212212            return true; 
  • trunk/wp-admin/includes/class-wp-ms-sites-list-table.php

    r18871 r19593  
    252252 
    253253                                if ( get_blog_status( $blog['blog_id'], 'archived' ) == '1' ) 
    254                                     $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>'; 
     254                                    $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>'; 
    255255                                else 
    256256                                    $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>'; 
  • trunk/wp-admin/includes/class-wp-ms-users-list-table.php

    r18871 r19593  
    243243                                        $class .= 'site-archived '; 
    244244 
    245                                     $actions['view'] = '<a class="' . $class . '" href="' .  esc_url( get_home_url( $val->userblog_id ) ) . '">' . __( 'View' ) . '</a>'; 
     245                                    $actions['view'] = '<a class="' . $class . '" href="' . esc_url( get_home_url( $val->userblog_id ) ) . '">' . __( 'View' ) . '</a>'; 
    246246 
    247247                                    $actions = apply_filters('ms_user_list_site_actions', $actions, $val->userblog_id); 
  • trunk/wp-admin/includes/class-wp-terms-list-table.php

    r19415 r19593  
    4343        global $taxonomy; 
    4444 
    45         $tags_per_page = $this->get_items_per_page( 'edit_' .  $taxonomy . '_per_page' ); 
     45        $tags_per_page = $this->get_items_per_page( 'edit_' . $taxonomy . '_per_page' ); 
    4646 
    4747        if ( 'post_tag' == $taxonomy ) { 
  • trunk/wp-admin/includes/class-wp-themes-list-table.php

    r18673 r19593  
    150150    $activate_text = esc_attr( sprintf( __( 'Activate &#8220;%s&#8221;' ), $title ) ); 
    151151    $actions = array(); 
    152     $actions[] = '<a href="' . $activate_link .  '" class="activatelink" title="' . $activate_text . '">' . __( 'Activate' ) . '</a>'; 
     152    $actions[] = '<a href="' . $activate_link . '" class="activatelink" title="' . $activate_text . '">' . __( 'Activate' ) . '</a>'; 
    153153    $actions[] = '<a href="' . $preview_link . '" class="thickbox thickbox-preview" title="' . esc_attr( sprintf( __( 'Preview &#8220;%s&#8221;' ), $theme_name ) ) . '">' . __( 'Preview' ) . '</a>'; 
    154154    if ( ! is_multisite() && current_user_can( 'delete_themes' ) ) 
  • trunk/wp-admin/includes/class-wp-upgrader.php

    r19246 r19593  
    14201420        $install_actions = array( 
    14211421            'preview' => '<a href="' . $preview_link . '" class="thickbox thickbox-preview" title="' . esc_attr(sprintf(__('Preview &#8220;%s&#8221;'), $name)) . '">' . __('Preview') . '</a>', 
    1422             'activate' => '<a href="' . $activate_link .  '" class="activatelink" title="' . esc_attr( sprintf( __('Activate &#8220;%s&#8221;'), $name ) ) . '">' . __('Activate') . '</a>' 
     1422            'activate' => '<a href="' . $activate_link . '" class="activatelink" title="' . esc_attr( sprintf( __('Activate &#8220;%s&#8221;'), $name ) ) . '">' . __('Activate') . '</a>' 
    14231423                            ); 
    14241424 
     
    14761476 
    14771477            $update_actions['preview'] = '<a href="' . $preview_link . '" class="thickbox thickbox-preview" title="' . esc_attr(sprintf(__('Preview &#8220;%s&#8221;'), $name)) . '">' . __('Preview') . '</a>'; 
    1478             $update_actions['activate'] = '<a href="' . $activate_link .  '" class="activatelink" title="' . esc_attr( sprintf( __('Activate &#8220;%s&#8221;'), $name ) ) . '">' . __('Activate') . '</a>'; 
     1478            $update_actions['activate'] = '<a href="' . $activate_link . '" class="activatelink" title="' . esc_attr( sprintf( __('Activate &#8220;%s&#8221;'), $name ) ) . '">' . __('Activate') . '</a>'; 
    14791479 
    14801480            if ( ( ! $this->result || is_wp_error($this->result) ) || $stylesheet == get_stylesheet() ) 
  • trunk/wp-admin/includes/class-wp-users-list-table.php

    r18735 r19593  
    210210     * 
    211211     * @param object $user_object 
    212      * @param string $style Optional. Attributes added to the TR element.  Must be sanitized. 
     212     * @param string $style Optional. Attributes added to the TR element. Must be sanitized. 
    213213     * @param string $role Key for the $wp_roles array. 
    214      * @param int $numposts Optional. Post count to display for this user.  Defaults to zero, as in, a new user has made zero posts. 
     214     * @param int $numposts Optional. Post count to display for this user. Defaults to zero, as in, a new user has made zero posts. 
    215215     * @return string 
    216216     */ 
  • trunk/wp-admin/includes/dashboard.php

    r19545 r19593  
    274274    echo '</tr><tr>'; 
    275275    /* TODO: Show status breakdown on hover 
    276     if ( $can_edit_pages && !empty($num_pages->publish) ) { // how many pages is not exposed in feeds.  Don't show if !current_user_can 
     276    if ( $can_edit_pages && !empty($num_pages->publish) ) { // how many pages is not exposed in feeds. Don't show if !current_user_can 
    277277        $post_type_texts[] = '<a href="edit-pages.php">'.sprintf( _n( '%s page', '%s pages', $num_pages->publish ), number_format_i18n( $num_pages->publish ) ).'</a>'; 
    278278    } 
     
    11161116        $_POST['widget-rss'][$number] = stripslashes_deep( $_POST['widget-rss'][$number] ); 
    11171117        $widget_options[$widget_id] = wp_widget_rss_process( $_POST['widget-rss'][$number] ); 
    1118         // title is optional.  If black, fill it if possible 
     1118        // title is optional. If black, fill it if possible 
    11191119        if ( !$widget_options[$widget_id]['title'] && isset($_POST['widget-rss'][$number]['title']) ) { 
    11201120            $rss = fetch_feed($widget_options[$widget_id]['url']); 
  • trunk/wp-admin/includes/deprecated.php

    r19520 r19593  
    134134 * @see register_setting() 
    135135 * 
    136  * @param string $option_group A settings group name.  Should correspond to a whitelisted option key name. 
     136 * @param string $option_group A settings group name. Should correspond to a whitelisted option key name. 
    137137 *  Default whitelisted option key names include "general," "discussion," and "reading," among others. 
    138138 * @param string $option_name The name of an option to sanitize and save. 
     
    871871 * @see WP_Screen 
    872872 * 
    873  * @param string    $screen The handle for the screen to add help to.  This is usually the hook name returned by the add_*_page() functions. 
     873 * @param string    $screen The handle for the screen to add help to. This is usually the hook name returned by the add_*_page() functions. 
    874874 * @param string    $help   The content of an 'Overview' help tab. 
    875875 */ 
  • trunk/wp-admin/includes/file.php

    r19225 r19593  
    241241    $upload_error_handler = 'wp_handle_upload_error'; 
    242242 
    243     // You may have had one or more 'wp_handle_upload_prefilter' functions error out the file.  Handle that gracefully. 
     243    // You may have had one or more 'wp_handle_upload_prefilter' functions error out the file. Handle that gracefully. 
    244244    if ( isset( $file['error'] ) && !is_numeric( $file['error'] ) && $file['error'] ) 
    245245        return $upload_error_handler( $file, $file['error'] ); 
     
    365365/** 
    366366 * Handle sideloads, which is the process of retrieving a media item from another server instead of 
    367  * a traditional media upload.  This process involves sanitizing the filename, checking extensions 
     367 * a traditional media upload. This process involves sanitizing the filename, checking extensions 
    368368 * for mime type, and moving the file to the appropriate directory within the uploads directory. 
    369369 * 
  • trunk/wp-admin/includes/image-edit.php

    r18996 r19593  
    193193    <div class="imgedit-wait" id="imgedit-wait-<?php echo $post_id; ?>"></div> 
    194194    <script type="text/javascript">imageEdit.init(<?php echo $post_id; ?>);</script> 
    195     <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> 
     195    <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> 
    196196    </div> 
    197197<?php 
  • trunk/wp-admin/includes/image.php

    r18632 r19593  
    206206    // exif contains a bunch of data we'll probably never need formatted in ways 
    207207    // that are difficult to use. We'll normalize it and just extract the fields 
    208     // that are likely to be useful.  Fractions and numbers are converted to 
     208    // that are likely to be useful. Fractions and numbers are converted to 
    209209    // floats, dates to unix timestamps, and everything else to strings. 
    210210    $meta = array( 
  • trunk/wp-admin/includes/ms.php

    r19314 r19593  
    5050 * 
    5151 * @param int $blog_id Blog ID 
    52  * @param bool $drop True if blog's table should be dropped.  Default is false. 
     52 * @param bool $drop True if blog's table should be dropped. Default is false. 
    5353 * @return void 
    5454 */ 
     
    775775 * 
    776776 * @since 3.3.0 
    777  * @param string $using 'sites or 'users'.  Default is 'sites'. 
     777 * @param string $using 'sites or 'users'. Default is 'sites'. 
    778778 * @return bool True if the network meets the criteria for large. False otherwise. 
    779779 */ 
  • trunk/wp-admin/includes/plugin-install.php

    r19112 r19593  
    200200 
    201201    if ( 'install' == $status ) { 
    202         if ( is_dir( WP_PLUGIN_DIR  . '/' . $api->slug ) ) { 
     202        if ( is_dir( WP_PLUGIN_DIR . '/' . $api->slug ) ) { 
    203203            $installed_plugin = get_plugins('/' . $api->slug); 
    204204            if ( empty($installed_plugin) ) { 
  • trunk/wp-admin/includes/plugin.php

    r18951 r19593  
    986986 
    987987    // If the parent doesn't already have a submenu, add a link to the parent 
    988     // as the first item in the submenu.  If the submenu file is the same as the 
    989     // parent file someone is trying to link back to the parent manually.  In 
     988    // as the first item in the submenu. If the submenu file is the same as the 
     989    // parent file someone is trying to link back to the parent manually. In 
    990990    // this case, don't automatically add a link back to avoid duplication. 
    991991    if (!isset( $submenu[$parent_slug] ) && $menu_slug != $parent_slug  ) { 
     
    10031003 
    10041004    $_registered_pages[$hookname] = true; 
    1005     // backwards-compatibility for plugins using add_management page.  See wp-admin/admin.php for redirect from edit.php to tools.php 
     1005    // backwards-compatibility for plugins using add_management page. See wp-admin/admin.php for redirect from edit.php to tools.php 
    10061006    if ( 'tools.php' == $parent_slug ) 
    10071007        $_registered_pages[get_plugin_page_hookname( $menu_slug, 'edit.php')] = true; 
     
    15901590 * @since 2.7.0 
    15911591 * 
    1592  * @param string $option_group A settings group name.  Should correspond to a whitelisted option key name. 
     1592 * @param string $option_group A settings group name. Should correspond to a whitelisted option key name. 
    15931593 *  Default whitelisted option key names include "general," "discussion," and "reading," among others. 
    15941594 * @param string $option_name The name of an option to sanitize and save. 
     
    17161716 * @since 2.7.0 
    17171717 * 
    1718  * @param string $option_group A settings group name.  This should match the group name used in register_setting(). 
     1718 * @param string $option_group A settings group name. This should match the group name used in register_setting(). 
    17191719 */ 
    17201720function settings_fields($option_group) { 
  • trunk/wp-admin/includes/post.php

    r19448 r19593  
    12601260        return $translated; 
    12611261 
    1262     // Only store one autosave.  If there is already an autosave, overwrite it. 
     1262    // Only store one autosave. If there is already an autosave, overwrite it. 
    12631263    if ( $old_autosave = wp_get_post_autosave( $post_id ) ) { 
    12641264        $new_autosave = _wp_post_revision_fields( $_POST, true ); 
     
    13211321    if ( 'draft' == $post->post_status ) { 
    13221322        $id = edit_post(); 
    1323     } else { // Non drafts are not overwritten.  The autosave is stored in a special post revision. 
     1323    } else { // Non drafts are not overwritten. The autosave is stored in a special post revision. 
    13241324        $id = wp_create_post_autosave( $post->ID ); 
    13251325        if ( ! is_wp_error($id) ) 
  • trunk/wp-admin/includes/schema.php

    r19470 r19593  
    3131 * 
    3232 * @param string $scope Optional. The tables for which to retrieve SQL. Can be all, global, ms_global, or blog tables. Defaults to all. 
    33  * @param int $blog_id Optional. The blog ID for which to retrieve SQL.  Default is the current blog ID. 
     33 * @param int $blog_id Optional. The blog ID for which to retrieve SQL. Default is the current blog ID. 
    3434 * @return string The SQL needed to create the requested tables. 
    3535 */ 
  • trunk/wp-admin/includes/screen.php

    r19563 r19593  
    209209final class WP_Screen { 
    210210    /** 
    211      * Any action associated with the screen. 'add' for *-add.php and *-new.php screens.  Empty otherwise. 
     211     * Any action associated with the screen. 'add' for *-add.php and *-new.php screens. Empty otherwise. 
    212212     * 
    213213     * @since 3.3.0 
     
    218218 
    219219    /** 
    220      * The base type of the screen.  This is typically the same as $id but with any post types and taxonomies stripped. 
     220     * The base type of the screen. This is typically the same as $id but with any post types and taxonomies stripped. 
    221221     * For example, for an $id of 'edit-post' the base is 'edit'. 
    222222     * 
     
    540540     * @since 3.3.0 
    541541     * 
    542      * @param string $parent_file The parent file of the screen.  Typically the $parent_file global. 
     542     * @param string $parent_file The parent file of the screen. Typically the $parent_file global. 
    543543     */ 
    544544    function set_parentage( $parent_file ) { 
     
    810810                        } 
    811811                        echo '<label for="wp_welcome_panel-hide">'; 
    812                         echo '<input type="checkbox" id="wp_welcome_panel-hide"' . checked( (bool) $welcome_checked, true, false )  . ' />'; 
     812                        echo '<input type="checkbox" id="wp_welcome_panel-hide"' . checked( (bool) $welcome_checked, true, false ) . ' />'; 
    813813                        echo __( 'Welcome' ) . "</label>\n"; 
    814814                    } 
  • trunk/wp-admin/includes/taxonomy.php

    r17071 r19593  
    8787 * @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. 
    8888 * @param bool $wp_error Optional, since 2.5.0. Set this to true if the caller handles WP_Error return values. 
    89  * @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. 
     89 * @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. 
    9090 */ 
    9191function wp_insert_category($catarr, $wp_error = false) { 
     
    146146 * @since 2.0.0 
    147147 * 
    148  * @param array $catarr The 'cat_ID' value is required.  All other keys are optional. 
     148 * @param array $catarr The 'cat_ID' value is required. All other keys are optional. 
    149149 * @return int|bool The ID number of the new or updated Category on success. Zero or FALSE on failure. 
    150150 */ 
  • trunk/wp-admin/includes/theme.php

    r19251 r19593  
    254254        $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. 
    255255        $update_url = wp_nonce_url('update.php?action=upgrade-theme&amp;theme=' . urlencode($stylesheet), 'upgrade-theme_' . $stylesheet); 
    256         $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;"'; 
     256        $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;"'; 
    257257 
    258258        if ( !is_multisite() ) { 
  • trunk/wp-admin/includes/upgrade.php

    r19470 r19593  
    5959        update_option('default_pingback_flag', 0); 
    6060 
    61     // Create default user.  If the user already exists, the user tables are 
    62     // being shared among blogs.  Just set the role in that case. 
     61    // Create default user. If the user already exists, the user tables are 
     62    // being shared among blogs. Just set the role in that case. 
    6363    $user_id = username_exists($user_name); 
    6464    $user_password = trim($user_password); 
     
    359359    $wp_current_db_version = __get_option('db_version'); 
    360360 
    361     // We are up-to-date.  Nothing to do. 
     361    // We are up-to-date. Nothing to do. 
    362362    if ( $wp_db_version == $wp_current_db_version ) 
    363363        return; 
     
    395395    $wp_current_db_version = __get_option('db_version'); 
    396396 
    397     // We are up-to-date.  Nothing to do. 
     397    // We are up-to-date. Nothing to do. 
    398398    if ( $wp_db_version == $wp_current_db_version ) 
    399399        return; 
     
    647647 
    648648    // If plugins are not stored in an array, they're stored in the old 
    649     // newline separated format.  Convert to new format. 
     649    // newline separated format. Convert to new format. 
    650650    if ( !is_array( $active_plugins ) ) { 
    651651        $active_plugins = explode("\n", trim($active_plugins)); 
     
    899899    } 
    900900 
    901     // < 3570 we used linkcategories.  >= 3570 we used categories and link2cat. 
     901    // < 3570 we used linkcategories. >= 3570 we used categories and link2cat. 
    902902    if ( $wp_current_db_version < 3570 ) { 
    903         // Create link_category terms for link categories.  Create a map of link cat IDs 
     903        // Create link_category terms for link categories. Create a map of link cat IDs 
    904904        // to link_category terms. 
    905905        $link_cat_id_map = array(); 
     
    16911691 
    16921692    // Copy files from the old locations to the site theme. 
    1693     // TODO: This does not copy arbitrary include dependencies.  Only the 
     1693    // TODO: This does not copy arbitrary include dependencies. Only the 
    16941694    // standard WP files are copied. 
    16951695    $files = array('index.php' => 'index.php', 'wp-layout.css' => 'style.css', 'wp-comments.php' => 'comments.php', 'wp-comments-popup.php' => 'comments-popup.php'); 
     
    19391939    // Upgrade versions prior to 2.9 
    19401940    if ( $wp_current_db_version < 11557 ) { 
    1941         // Delete duplicate options.  Keep the option with the highest option_id. 
     1941        // Delete duplicate options. Keep the option with the highest option_id. 
    19421942        $wpdb->query("DELETE o1 FROM $wpdb->options AS o1 JOIN $wpdb->options AS o2 USING (`option_name`) WHERE o2.option_id > o1.option_id"); 
    19431943 
  • trunk/wp-admin/install.php

    r19297 r19593  
    208208        } elseif ( ! is_email( $admin_email ) ) { 
    209209            // TODO: poka-yoke 
    210             display_setup_form( __( 'that isn&#8217;t a valid e-mail address.  E-mail addresses look like: <code>username@example.com</code>' ) ); 
     210            display_setup_form( __( 'that isn&#8217;t a valid e-mail address. E-mail addresses look like: <code>username@example.com</code>' ) ); 
    211211            $error = true; 
    212212        } 
  • trunk/wp-admin/js/common.dev.js

    r19528 r19593  
    317317 
    318318        try { 
    319             this.lastKey = 9; // not a standard DOM property, lastKey is to help stop Opera tab event.  See blur handler below. 
     319            this.lastKey = 9; // not a standard DOM property, lastKey is to help stop Opera tab event. See blur handler below. 
    320320        } catch(err) {} 
    321321 
  • trunk/wp-admin/maint/repair.php

    r19073 r19593  
    2020 
    2121if ( !defined('WP_ALLOW_REPAIR') ) { 
    22     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>"; 
     22    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>"; 
    2323} elseif ( isset($_GET['repair']) ) { 
    2424    check_admin_referer('repair_db'); 
     
    5050        } else { 
    5151            /* translators: 1: table name, 2: error message, */ 
    52             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>" ); 
     52            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>" ); 
    5353 
    5454            $repair = $wpdb->get_row("REPAIR TABLE $table"); 
     
    9696        echo '<textarea name="errors" id="errors" rows="20" cols="60">' . esc_textarea( implode("\n", $problem_output) ) . '</textarea>'; 
    9797    } else { 
    98         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>"; 
     98        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>"; 
    9999    } 
    100100} else { 
     
    102102        _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.'); 
    103103    else 
    104         _e('WordPress can automatically look for some common database problems and repair them.  Repairing can take a while, so please be patient.') 
     104        _e('WordPress can automatically look for some common database problems and repair them. Repairing can take a while, so please be patient.') 
    105105?> 
    106106    <p class="step"><a class="button" href="<?php echo wp_nonce_url('repair.php?repair=1', 'repair_db') ?>"><?php _e( 'Repair Database' ); ?></a></p> 
    107     <?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.'); ?> 
     107    <?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.'); ?> 
    108108    <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> 
    109109<?php 
  • trunk/wp-admin/network/settings.php

    r19514 r19593  
    323323            $menu_items = apply_filters( 'mu_menu_items', array( 'plugins' => __( 'Plugins' ) ) ); 
    324324            foreach ( (array) $menu_items as $key => $val ) { 
    325                 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/>"; 
     325                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/>"; 
    326326            } 
    327327            ?> 
  • trunk/wp-admin/network/site-info.php

    r19514 r19593  
    109109foreach ( $tabs as $tab_id => $tab ) { 
    110110    $class = ( $tab['url'] == $pagenow ) ? ' nav-tab-active' : ''; 
    111     echo '<a href="' . $tab['url'] . '?id=' . $id .'" class="nav-tab' . $class . '">' .  esc_html( $tab['label'] ) . '</a>'; 
     111    echo '<a href="' . $tab['url'] . '?id=' . $id .'" class="nav-tab' . $class . '">' . esc_html( $tab['label'] ) . '</a>'; 
    112112} 
    113113?> 
  • trunk/wp-admin/network/site-settings.php

    r19514 r19593  
    9999foreach ( $tabs as $tab_id => $tab ) { 
    100100    $class = ( $tab['url'] == $pagenow ) ? ' nav-tab-active' : ''; 
    101     echo '<a href="' . $tab['url'] . '?id=' . $id .'" class="nav-tab' . $class . '">' .  esc_html( $tab['label'] ) . '</a>'; 
     101    echo '<a href="' . $tab['url'] . '?id=' . $id .'" class="nav-tab' . $class . '">' . esc_html( $tab['label'] ) . '</a>'; 
    102102} 
    103103?> 
  • trunk/wp-admin/network/site-themes.php

    r19579 r19593  
    153153foreach ( $tabs as $tab_id => $tab ) { 
    154154    $class = ( $tab['url'] == $pagenow ) ? ' nav-tab-active' : ''; 
    155     echo '<a href="' . $tab['url'] . '?id=' . $id .'" class="nav-tab' . $class . '">' .  esc_html( $tab['label'] ) . '</a>'; 
     155    echo '<a href="' . $tab['url'] . '?id=' . $id .'" class="nav-tab' . $class . '">' . esc_html( $tab['label'] ) . '</a>'; 
    156156} 
    157157?> 
  • trunk/wp-admin/network/site-users.php

    r19579 r19593  
    187187foreach ( $tabs as $tab_id => $tab ) { 
    188188    $class = ( $tab['url'] == $pagenow ) ? ' nav-tab-active' : ''; 
    189     echo '<a href="' . $tab['url'] . '?id=' . $id .'" class="nav-tab' . $class . '">' .  esc_html( $tab['label'] ) . '</a>'; 
     189    echo '<a href="' . $tab['url'] . '?id=' . $id .'" class="nav-tab' . $class . '">' . esc_html( $tab['label'] ) . '</a>'; 
    190190} 
    191191?> 
  • trunk/wp-admin/options-discussion.php

    r19507 r19593  
    165165<h3><?php _e('Avatars'); ?></h3> 
    166166 
    167 <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> 
     167<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> 
    168168 
    169169<?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? ?> 
     
    229229foreach ( $avatar_defaults as $default_key => $default_name ) { 
    230230    $selected = ($default == $default_key) ? 'checked="checked" ' : ''; 
    231     $avatar_list .= "\n\t<label><input type='radio' name='avatar_default' id='avatar_{$default_key}' value='" . esc_attr($default_key)  . "' {$selected}/> "; 
     231    $avatar_list .= "\n\t<label><input type='radio' name='avatar_default' id='avatar_{$default_key}' value='" . esc_attr($default_key) . "' {$selected}/> "; 
    232232 
    233233    $avatar = get_avatar( $user_email, $size, $default_key ); 
  • trunk/wp-admin/options-general.php

    r19538 r19593  
    152152$check_zone_info = true; 
    153153 
    154 // Remove old Etc mappings.  Fallback to gmt_offset. 
     154// Remove old Etc mappings. Fallback to gmt_offset. 
    155155if ( false !== strpos($tzstring,'Etc/GMT') ) 
    156156    $tzstring = ''; 
  • trunk/wp-admin/options-writing.php

    r19507 r19593  
    3333    $post_email_help = '<p>' . __('Due to security issues, you cannot use Post By Email on Multisite Installs.') . '</p>'; 
    3434} else { 
    35     $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>'; 
     35    $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>'; 
    3636} 
    3737 
  • trunk/wp-admin/plugin-editor.php

    r19528 r19593  
    237237<?php if ( is_writeable($real_file) ) : ?> 
    238238    <?php if ( in_array( $file, (array) get_option( 'active_plugins', array() ) ) ) { ?> 
    239         <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> 
     239        <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> 
    240240    <?php } ?> 
    241241    <p class="submit"> 
  • trunk/wp-admin/plugins.php

    r19528 r19593  
    356356        $errmsg = __( 'You cannot delete a plugin while it is active on the main site.' ); 
    357357    elseif ( isset($_GET['charsout']) ) 
    358         $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']); 
     358        $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']); 
    359359    else 
    360360        $errmsg = __('Plugin could not be activated because it triggered a <strong>fatal error</strong>.'); 
  • trunk/wp-admin/themes.php

    r19510 r19593  
    7777 
    7878<?php if ( ! validate_current_theme() ) : ?> 
    79 <div id="message1" class="updated"><p><?php _e('The active theme is broken.  Reverting to the default theme.'); ?></p></div> 
     79<div id="message1" class="updated"><p><?php _e('The active theme is broken. Reverting to the default theme.'); ?></p></div> 
    8080<?php elseif ( isset($_GET['activated']) ) : 
    8181        if ( isset($wp_registered_sidebars) && count( (array) $wp_registered_sidebars ) && current_user_can('edit_theme_options') ) { ?> 
  • trunk/wp-admin/update-core.php

    r19535 r19593  
    3737    $show_buttons = true; 
    3838    if ( 'development' == $update->response ) { 
    39         $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:'); 
     39        $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:'); 
    4040        $download = __('Download nightly build'); 
    4141    } else { 
     
    318318    <tr class='active'> 
    319319        <th scope='row' class='check-column'><input type='checkbox' name='checked[]' value='" . esc_attr($stylesheet) . "' /></th> 
    320         <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> 
     320        <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> 
    321321    </tr>"; 
    322322    } 
  • trunk/wp-admin/upgrade.php

    r19060 r19593  
    2828    $step = 0; 
    2929 
    30 // Do it.  No output. 
     30// Do it. No output. 
    3131if ( 'upgrade_db' === $step ) { 
    3232    wp_upgrade(); 
  • trunk/wp-admin/user-new.php

    r19528 r19593  
    164164                '<ul>' . 
    165165                '<li>' . __('Administrators have access to all the administration features.') . '</li>' . 
    166                 '<li>' . __('Editors can publish posts, manage posts as well as manage other people&#8217;s posts, etc.')  . '</li>' . 
     166                '<li>' . __('Editors can publish posts, manage posts as well as manage other people&#8217;s posts, etc.') . '</li>' . 
    167167                '<li>' . __('Authors can publish and manage their own posts, and are able to upload files.') . '</li>' . 
    168168                '<li>' . __('Contributors can write and manage their posts but not publish posts or upload media files.') . '</li>' . 
     
    252252        echo '<h3 id="add-existing-user">' . __('Add Existing User') . '</h3>'; 
    253253    if ( !is_super_admin() ) { 
    254         _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.' ); 
     254        _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.' ); 
    255255        $label = __('E-mail'); 
    256256    } else { 
    257         _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.' ); 
     257        _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.' ); 
    258258        $label = __('E-mail or Username'); 
    259259    } 
  • trunk/wp-admin/users.php

    r19528 r19593  
    3434                    '<ul>' . 
    3535                    '<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>' . 
    36                     '<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>' . 
     36                    '<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>' . 
    3737                    '<li>' . __('You can view all posts made by a user by clicking on the number under the Posts column.') . '</li>' . 
    3838                    '</ul>' 
  • trunk/wp-app.php

    r19074 r19593  
    286286        // check to see if AtomPub is enabled 
    287287        if ( !get_option( 'enable_app' ) ) 
    288             $this->forbidden( sprintf( __( 'AtomPub services are disabled on this site.  An admin user can enable them at %s' ), admin_url('options-writing.php') ) ); 
     288            $this->forbidden( sprintf( __( 'AtomPub services are disabled on this site. An admin user can enable them at %s' ), admin_url('options-writing.php') ) ); 
    289289 
    290290        // dispatch 
     
    371371        $cats = get_categories(array('hierarchical' => 0, 'hide_empty' => 0)); 
    372372        foreach ( (array) $cats as $cat ) { 
    373             $categories .= "    <category term=\"" . esc_attr($cat->name) .  "\" />\n"; 
     373            $categories .= "    <category term=\"" . esc_attr($cat->name) . "\" />\n"; 
    374374        } 
    375375        $output = <<<EOD 
  • trunk/wp-includes/admin-bar.php

    r19559 r19593  
    681681 * Set the display status of the admin bar. 
    682682 * 
    683  * This can be called immediately upon plugin load.  It does not need to be called from a function hooked to the init action. 
     683 * This can be called immediately upon plugin load. It does not need to be called from a function hooked to the init action. 
    684684 * 
    685685 * @since 3.1.0 
  • trunk/wp-includes/cache.php

    r18995 r19593  
    5252 * 
    5353 * @param int|string $key The cache key to increment 
    54  * @param int $offset The amount by which to decrement the item's value.  Default is 1. 
     54 * @param int $offset The amount by which to decrement the item's value. Default is 1. 
    5555 * @param string $group The group the key is in. 
    5656 * @return false|int False on failure, the item's new value on success. 
     
    121121 * 
    122122 * @param int|string $key The cache key to increment 
    123  * @param int $offset The amount by which to increment the item's value.  Default is 1. 
     123 * @param int $offset The amount by which to increment the item's value. Default is 1. 
    124124 * @param string $group The group the key is in. 
    125125 * @return false|int False on failure, the item's new value on success. 
     
    205205 
    206206/** 
    207  * Reset internal cache keys and structures.  If the cache backend uses global blog or site IDs as part of its cache keys, 
     207 * Reset internal cache keys and structures. If the cache backend uses global blog or site IDs as part of its cache keys, 
    208208 * this function instructs the backend to reset those keys and perform any cleanup since blog or site IDs have changed since cache init. 
    209209 * 
     
    318318     * 
    319319     * @param int|string $key The cache key to increment 
    320      * @param int $offset The amount by which to decrement the item's value.  Default is 1. 
     320     * @param int $offset The amount by which to decrement the item's value. Default is 1. 
    321321     * @param string $group The group the key is in. 
    322322     * @return false|int False on failure, the item's new value on success. 
     
    417417     * 
    418418     * @param int|string $key The cache key to increment 
    419      * @param int $offset The amount by which to increment the item's value.  Default is 1. 
     419     * @param int $offset The amount by which to increment the item's value. Default is 1. 
    420420     * @param string $group The group the key is in. 
    421421     * @return false|int False on failure, the item's new value on success. 
  • trunk/wp-includes/capabilities.php

    r19325 r19593  
    12091209    $user = new WP_User( $current_user->ID) ; 
    12101210 
    1211     // Set the blog id.  @todo add blog id arg to WP_User constructor? 
     1211    // Set the blog id. @todo add blog id arg to WP_User constructor? 
    12121212    $user->for_blog( $blog_id ); 
    12131213 
  • trunk/wp-includes/class-http.php

    r19094 r19593  
    202202     * @param string $url URL to Request 
    203203     * 
    204      * @return string|false Class name for the first transport that claims to support the request.  False if no transport claims to support the request. 
     204     * @return string|false Class name for the first transport that claims to support the request. False if no transport claims to support the request. 
    205205     */ 
    206206    public function _get_first_available_transport( $args, $url = null ) { 
     
    10321032 
    10331033 
    1034         // CURLOPT_TIMEOUT and CURLOPT_CONNECTTIMEOUT expect integers.  Have to use ceil since 
     1034        // CURLOPT_TIMEOUT and CURLOPT_CONNECTTIMEOUT expect integers. Have to use ceil since 
    10351035        // a value of 0 will allow an unlimited timeout. 
    10361036        $timeout = (int) ceil( $r['timeout'] ); 
  • trunk/wp-includes/class-wp-xmlrpc-server.php

    r19071 r19593  
    157157    function login_pass_ok($user_login, $user_pass) { 
    158158        if ( !get_option( 'enable_xmlrpc' ) ) { 
    159             $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') ) ); 
     159            $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') ) ); 
    160160            return false; 
    161161        } 
     
    179179    function login($username, $password) { 
    180180        if ( !get_option( 'enable_xmlrpc' ) ) { 
    181             $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') ) ); 
     181            $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') ) ); 
    182182            return false; 
    183183        } 
     
    19461946 
    19471947        /* so it is actually editable with a windows/mac client */ 
    1948         // 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); 
     1948        // 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); 
    19491949 
    19501950        return $content; 
     
    25452545 
    25462546        // If there is no post data for the give post id, stop 
    2547         // now and return an error.  Other wise a new post will be 
     2547        // now and return an error. Other wise a new post will be 
    25482548        // created (which was the old behavior). 
    25492549        if ( empty($postdata["ID"]) ) 
  • trunk/wp-includes/class-wp.php

    r19280 r19593  
    157157 
    158158            // Trim path info from the end and the leading home path from the 
    159             // front.  For path info requests, this leaves us with the requesting 
    160             // filename, if any.  For 404 requests, this leaves us with the 
     159            // front. For path info requests, this leaves us with the requesting 
     160            // filename, if any. For 404 requests, this leaves us with the 
    161161            // requested permalink. 
    162162            $req_uri = str_replace($pathinfo, '', $req_uri); 
     
    402402        } 
    403403 
    404         // query_string filter deprecated.  Use request filter instead. 
     404        // query_string filter deprecated. Use request filter instead. 
    405405        if ( has_filter('query_string') ) {  // Don't bother filtering and parsing if no plugins are hooked in. 
    406406            $this->query_string = apply_filters('query_string', $this->query_string); 
  • trunk/wp-includes/class.wp-dependencies.php

    r18480 r19593  
    2929     * Do the dependencies 
    3030     * 
    31      * Process the items passed to it or the queue.  Processes all dependencies. 
     31     * Process the items passed to it or the queue. Processes all dependencies. 
    3232     * 
    3333     * @param mixed $handles (optional) items to be processed. (void) processes queue, (string) process that item, (array of strings) process those items 
     
    6464     * Determines dependencies 
    6565     * 
    66      * Recursively builds array of items to process taking dependencies into account.  Does NOT catch infinite loops. 
     66     * Recursively builds array of items to process taking dependencies into account. Does NOT catch infinite loops. 
    6767     * 
    6868     * 
     
    9191                $keep_going = false; // Script doesn't exist 
    9292            elseif ( $this->registered[$handle]->deps && array_diff($this->registered[$handle]->deps, array_keys($this->registered)) ) 
    93                 $keep_going = false; // Script requires deps which don't exist (not a necessary check.  efficiency?) 
     93                $keep_going = false; // Script requires deps which don't exist (not a necessary check. efficiency?) 
    9494            elseif ( $this->registered[$handle]->deps && !$this->all_deps( $this->registered[$handle]->deps, true, $group ) ) 
    9595                $keep_going = false; // Script requires deps which don't exist 
     
    9999                    return false; // Abort this branch. 
    100100                else 
    101                     continue; // We're at the top level.  Move on to the next one. 
     101                    continue; // We're at the top level. Move on to the next one. 
    102102            } 
    103103 
  • trunk/wp-includes/class.wp-scripts.php

    r19573 r19593  
    3838     * Prints scripts 
    3939     * 
    40      * Prints the scripts passed to it or the print queue.  Also prints all necessary dependencies. 
     40     * Prints the scripts passed to it or the print queue. Also prints all necessary dependencies. 
    4141     * 
    42      * @param mixed $handles (optional) Scripts to be printed.  (void) prints queue, (string) prints that script, (array of strings) prints those scripts. 
     42     * @param mixed $handles (optional) Scripts to be printed. (void) prints queue, (string) prints that script, (array of strings) prints those scripts. 
    4343     * @param int $group (optional) If scripts were queued in groups prints this group number. 
    4444     * @return array Scripts that have been printed 
  • trunk/wp-includes/comment-template.php

    r19284 r19593  
    5656 * @uses $comment 
    5757 * 
    58  * @param int $comment_ID The ID of the comment for which to get the author's email.  Optional. 
     58 * @param int $comment_ID The ID of the comment for which to get the author's email. Optional. 
    5959 * @return string The current comment author's email 
    6060 */ 
     
    142142 * @uses apply_filters() Calls 'get_comment_author_link' hook on the complete link HTML or author 
    143143 * 
    144  * @param int $comment_ID The ID of the comment for which to get the author's link.  Optional. 
     144 * @param int $comment_ID The ID of the comment for which to get the author's link. Optional. 
    145145 * @return string Comment Author name or HTML link for author's URL 
    146146 */ 
     
    190190 * @see get_comment_author_IP() Echoes Result 
    191191 * 
    192  * @param int $comment_ID The ID of the comment for which to print the author's IP address.  Optional. 
     192 * @param int $comment_ID The ID of the comment for which to print the author's IP address. Optional. 
    193193 */ 
    194194function comment_author_IP( $comment_ID = 0 ) { 
     
    202202 * @uses apply_filters() Calls 'get_comment_author_url' hook on the comment author's URL 
    203203 * 
    204  * @param int $comment_ID The ID of the comment for which to get the author's URL.  Optional. 
     204 * @param int $comment_ID The ID of the comment for which to get the author's URL. Optional. 
    205205 * @return string 
    206206 */ 
     
    385385 * 
    386386 * @param string $d The format of the date (defaults to user's config) 
    387  * @param int $comment_ID The ID of the comment for which to print the date.  Optional. 
     387 * @param int $comment_ID The ID of the comment for which to print the date. Optional. 
    388388 */ 
    389389function comment_date( $d = '', $comment_ID = 0 ) { 
     
    913913        require( $include ); 
    914914    elseif ( file_exists( TEMPLATEPATH . $file ) ) 
    915         require( TEMPLATEPATH .  $file ); 
     915        require( TEMPLATEPATH . $file ); 
    916916    else // Backward compat code will be removed in a future release 
    917917        require( ABSPATH . WPINC . '/theme-compat/comments.php'); 
     
    10921092 * 
    10931093 * @param array $args Optional. Override default options. 
    1094  * @param int|object $post Optional. Post that the comment is going to be displayed on.  Defaults to current post. 
     1094 * @param int|object $post Optional. Post that the comment is going to be displayed on. Defaults to current post. 
    10951095 * @return string|bool|null Link to show comment form, if successful. False, if comments are closed. 
    10961096 */ 
     
    14091409 * 
    14101410 * @param string|array $args Formatting options 
    1411  * @param array $comments Optional array of comment objects.  Defaults to $wp_query->comments 
     1411 * @param array $comments Optional array of comment objects. Defaults to $wp_query->comments 
    14121412 */ 
    14131413function wp_list_comments($args = array(), $comments = null ) { 
     
    15351535        'fields'               => apply_filters( 'comment_form_default_fields', $fields ), 
    15361536        '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>', 
    1537         '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>', 
     1537        '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>', 
    15381538        '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>', 
    15391539        'comment_notes_before' => '<p class="comment-notes">' . __( 'Your email address will not be published.' ) . ( $req ? $required_text : '' ) . '</p>', 
  • trunk/wp-includes/comment.php

    r18907 r19593  
    686686 
    687687            if ( defined('DOING_AJAX') ) 
    688                 die( __('You are posting comments too quickly.  Slow down.') ); 
    689  
    690             wp_die( __('You are posting comments too quickly.  Slow down.'), '', array('response' => 403) ); 
     688                die( __('You are posting comments too quickly. Slow down.') ); 
     689 
     690            wp_die( __('You are posting comments too quickly. Slow down.'), '', array('response' => 403) ); 
    691691        } 
    692692    } 
     
    724724 * @uses Walker_Comment 
    725725 * 
    726  * @param array $comments Optional array of comment objects.  Defaults to $wp_query->comments 
     726 * @param array $comments Optional array of comment objects. Defaults to $wp_query->comments 
    727727 * @param int $per_page Optional comments per page. 
    728728 * @param boolean $threaded Optional control over flat or threaded comments. 
     
    19481948 
    19491949/** 
    1950  * Close comments on old posts on the fly, without any extra DB queries.  Hooked to the_posts. 
     1950 * Close comments on old posts on the fly, without any extra DB queries. Hooked to the_posts. 
    19511951 * 
    19521952 * @access private 
     
    19781978 
    19791979/** 
    1980  * Close comments on an old post.  Hooked to comments_open and pings_open. 
     1980 * Close comments on an old post. Hooked to comments_open and pings_open. 
    19811981 * 
    19821982 * @access private 
  • trunk/wp-includes/cron.php

    r18659 r19593  
    4848 * visits your WordPress site, if the scheduled time has passed. 
    4949 * 
    50  * Valid values for the recurrence are hourly, daily and twicedaily.  These can 
     50 * Valid values for the recurrence are hourly, daily and twicedaily. These can 
    5151 * be extended using the cron_schedules filter in wp_get_schedules(). 
    5252 * 
  • trunk/wp-includes/default-constants.php

    r18659 r19593  
    106106     */ 
    107107    if ( !defined('PLUGINDIR') ) 
    108         define( 'PLUGINDIR', 'wp-content/plugins' ); // Relative to ABSPATH.  For back compat. 
     108        define( 'PLUGINDIR', 'wp-content/plugins' ); // Relative to ABSPATH. For back compat. 
    109109 
    110110    /** 
     
    131131     */ 
    132132    if ( !defined( 'MUPLUGINDIR' ) ) 
    133         define( 'MUPLUGINDIR', 'wp-content/mu-plugins' ); // Relative to ABSPATH.  For back compat. 
     133        define( 'MUPLUGINDIR', 'wp-content/mu-plugins' ); // Relative to ABSPATH. For back compat. 
    134134} 
    135135 
  • trunk/wp-includes/formatting.php

    r19187 r19593  
    733733    $mimes = get_allowed_mime_types(); 
    734734 
    735     // Loop over any intermediate extensions.  Munge them with a trailing underscore if they are a 2 - 5 character 
     735    // Loop over any intermediate extensions. Munge them with a trailing underscore if they are a 2 - 5 character 
    736736    // long alpha string not in the extension whitelist. 
    737737    foreach ( (array) $parts as $part) { 
  • trunk/wp-includes/functions.php

    r19417 r19593  
    19061906    $suppress = $wpdb->suppress_errors(); 
    19071907 
    1908     // Loop over the WP tables.  If none exist, then scratch install is allowed. 
     1908    // Loop over the WP tables. If none exist, then scratch install is allowed. 
    19091909    // If one or more exist, suggest table repair since we got here because the options 
    19101910    // table could not be accessed. 
     
    19231923 
    19241924        // Die with a DB error. 
    1925         $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' ); 
     1925        $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' ); 
    19261926        dead_db(); 
    19271927    } 
     
    37863786 * Suspend cache invalidation. 
    37873787 * 
    3788  * Turns cache invalidation on and off.  Useful during imports where you don't wont to do invalidations 
    3789  * every time a post is inserted.  Callers must be sure that what they are doing won't lead to an inconsistent 
     3788 * Turns cache invalidation on and off. Useful during imports where you don't wont to do invalidations 
     3789 * every time a post is inserted. Callers must be sure that what they are doing won't lead to an inconsistent 
    37903790 * cache when invalidation is suspended. 
    37913791 * 
  • trunk/wp-includes/general-template.php

    r19528 r19593  
    20812081 * @param string $file Optional. Style handle name or file name (without ".css" extension) relative 
    20822082 *   to wp-admin/. Defaults to 'wp-admin'. 
    2083  * @param bool $force_echo Optional.  Force the stylesheet link to be printed rather than enqueued. 
     2083 * @param bool $force_echo Optional. Force the stylesheet link to be printed rather than enqueued. 
    20842084 */ 
    20852085function wp_admin_css( $file = 'wp-admin', $force_echo = false ) { 
     
    20922092 
    20932093    if ( $wp_styles->query( $handle ) ) { 
    2094         if ( $force_echo || did_action( 'wp_print_styles' ) ) // we already printed the style queue.  Print this one immediately 
     2094        if ( $force_echo || did_action( 'wp_print_styles' ) ) // we already printed the style queue. Print this one immediately 
    20952095            wp_print_styles( $handle ); 
    20962096        else // Add to style queue 
  • trunk/wp-includes/http.php

    r18633 r19593  
    198198 * 
    199199 * @param array  $capabilities Array of capabilities to test or a wp_remote_request() $args array. 
    200  * @param string $url Optional.  If given, will check if the URL requires SSL and adds that requirement to the capabilities array. 
     200 * @param string $url Optional. If given, will check if the URL requires SSL and adds that requirement to the capabilities array. 
    201201 * 
    202202 * @return bool 
  • trunk/wp-includes/js/autosave.dev.js

    r19476 r19593  
    230230function autosave_disable_buttons() { 
    231231    jQuery(':button, :submit', '#submitpost').prop('disabled', true); 
    232     // Re-enable 5 sec later.  Just gives autosave a head start to avoid collisions. 
     232    // Re-enable 5 sec later. Just gives autosave a head start to avoid collisions. 
    233233    setTimeout(autosave_enable_buttons, 5000); 
    234234} 
  • trunk/wp-includes/kses.php

    r18856 r19593  
    1111 * This program is distributed in the hope that it will be useful, but WITHOUT 
    1212 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or 
    13  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for 
     13 * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for 
    1414 * more details. 
    1515 * 
     
    719719 * or apostrophes around them, to make it easier to produce HTML code that will 
    720720 * conform to W3C's HTML specification. It will also remove bad URL protocols 
    721  * from attribute values.  It also reduces duplicate attributes by using the 
     721 * from attribute values. It also reduces duplicate attributes by using the 
    722722 * attribute defined first (foo='bar' foo='baz' will result in foo='bar'). 
    723723 * 
  • trunk/wp-includes/link-template.php

    r19054 r19593  
    508508 * 
    509509 * @param string $link_text Descriptive text. 
    510  * @param int $post_id Optional post ID.  Default to current post. 
     510 * @param int $post_id Optional post ID. Default to current post. 
    511511 * @param string $feed Optional. Feed format. 
    512512 * @return string Link to the comment feed for the current post. 
     
    21882188 * Get the URL to the user's dashboard. 
    21892189 * 
    2190  * If a user does not belong to any site, the global user dashboard is used.  If the user belongs to the current site, 
     2190 * If a user does not belong to any site, the global user dashboard is used. If the user belongs to the current site, 
    21912191 * the dashboard for the current site is returned. If the user cannot edit the current site, the dashboard to the user's 
    21922192 * primary blog is returned. 
  • trunk/wp-includes/load.php

    r18827 r19593  
    569569 
    570570function wp_clone( $object ) { 
    571     // Use parens for clone to accommodate PHP 4.  See #17880 
     571    // Use parens for clone to accommodate PHP 4. See #17880 
    572572    return clone( $object ); 
    573573} 
  • trunk/wp-includes/locale.php

    r18827 r19593  
    114114        $this->weekday[6] = /* translators: weekday */ __('Saturday'); 
    115115 
    116         // The first letter of each day.  The _%day%_initial suffix is a hack to make 
     116        // The first letter of each day. The _%day%_initial suffix is a hack to make 
    117117        // sure the day initials are unique. 
    118118        $this->weekday_initial[__('Sunday')]    = /* translators: one-letter abbreviation of the weekday */ __('S_Sunday_initial'); 
  • trunk/wp-includes/media.php

    r18827 r19593  
    5454    } 
    5555    elseif ( $size == 'large' ) { 
    56         // we're inserting a large size image into the editor.  if it's a really 
     56        // We're inserting a large size image into the editor. If it's a really 
    5757        // big image we'll scale it down to fit reasonably within the editor 
    58         // itself, and within the theme's content width if it's known.  the user 
     58        // itself, and within the theme's content width if it's known. The user 
    5959        // can resize it in the editor if they wish. 
    6060        $max_width = intval(get_option('large_size_w')); 
  • trunk/wp-includes/meta.php

    r19054 r19593  
    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 The meta ID on successful update, false on failure. 
     
    8181 
    8282/** 
    83  * Update metadata for the specified object.  If no value already exists for the specified object 
     83 * Update metadata for the specified object. If no value already exists for the specified object 
    8484 * ID and metadata key, the metadata will be added. 
    8585 * 
     
    9595 * @param string $meta_key Metadata key 
    9696 * @param string $meta_value Metadata value 
    97  * @param string $prev_value Optional.  If specified, only update existing metadata entries with 
    98  *      the specified value.  Otherwise, update all entries. 
     97 * @param string $prev_value Optional. If specified, only update existing metadata entries with 
     98 *      the specified value. Otherwise, update all entries. 
    9999 * @return bool True on successful update, false on failure. 
    100100 */ 
     
    175175 * @param int $object_id ID of the object metadata is for 
    176176 * @param string $meta_key Metadata key 
    177  * @param string $meta_value Optional. Metadata value.  If specified, only delete metadata entries 
    178  *      with this value.  Otherwise, delete all entries with the specified meta_key. 
    179  * @param bool $delete_all Optional, default is false.  If true, delete matching metadata entries 
    180  *      for all objects, ignoring the specified object_id.  Otherwise, only delete matching 
     177 * @param string $meta_value Optional. Metadata value. If specified, only delete metadata entries 
     178 *      with this value. Otherwise, delete all entries with the specified meta_key. 
     179 * @param bool $delete_all Optional, default is false. If true, delete matching metadata entries 
     180 *      for all objects, ignoring the specified object_id. Otherwise, only delete matching 
    181181 *      metadata entries for the specified object_id. 
    182182 * @return bool True on successful delete, false on failure. 
     
    257257 * @param string $meta_type Type of object metadata is for (e.g., comment, post, or user) 
    258258 * @param int $object_id ID of the object metadata is for 
    259  * @param string $meta_key Optional.  Metadata key. If not specified, retrieve all metadata for 
     259 * @param string $meta_key Optional. Metadata key. If not specified, retrieve all metadata for 
    260260 *      the specified object. 
    261  * @param bool $single Optional, default is false.  If true, return only the first value of the 
    262  *      specified meta_key.  This parameter has no effect if meta_key is not specified. 
     261 * @param bool $single Optional, default is false. If true, return only the first value of the 
     262 *      specified meta_key. This parameter has no effect if meta_key is not specified. 
    263263 * @return string|array Single metadata value, or array of values 
    264264 */ 
  • trunk/wp-includes/ms-functions.php

    r19504 r19593  
    881881    if ( is_wp_error($blog_id) ) { 
    882882        // If blog is taken, that means a previous attempt to activate this blog failed in between creating the blog and 
    883         // setting the activation flag.  Let's just set the active flag and instruct the user to reset their password. 
     883        // setting the activation flag. Let's just set the active flag and instruct the user to reset their password. 
    884884        if ( 'blog_taken' == $blog_id->get_error_code() ) { 
    885885            $blog_id->add_data( $signup ); 
  • trunk/wp-includes/nav-menu-template.php

    r18746 r19593  
    114114 * Optional $args contents: 
    115115 * 
    116  * menu - The menu that is desired.  Accepts (matching in order) id, slug, name. Defaults to blank. 
     116 * menu - The menu that is desired. Accepts (matching in order) id, slug, name. Defaults to blank. 
    117117 * menu_class - CSS class to use for the ul element which forms the menu. Defaults to 'menu'. 
    118118 * menu_id - The ID that is applied to the ul element which forms the menu. Defaults to the menu slug, incremented. 
     
    126126 * link_after - Text after the link. 
    127127 * echo - Whether to echo the menu or return it. Defaults to echo. 
    128  * depth - how many levels of the hierarchy are to be included.  0 means all. Defaults to 0. 
     128 * depth - how many levels of the hierarchy are to be included. 0 means all. Defaults to 0. 
    129129 * walker - allows a custom walker to be specified. 
    130  * 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. 
     130 * 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. 
    131131 * items_wrap - How the list items should be wrapped. Defaults to a ul with an id and class. Uses printf() format with numbered placeholders. 
    132132 * 
  • trunk/wp-includes/nav-menu.php

    r18734 r19593  
    555555 * - type_label:    The singular label used to describe this type of menu item. 
    556556 * - post_parent:   The DB ID of the original object's parent object, if any (0 otherwise). 
    557  * - menu_item_parent:  The DB ID of the nav_menu_item that is this item's menu parent, if any.  0 otherwise. 
     557 * - menu_item_parent:  The DB ID of the nav_menu_item that is this item's menu parent, if any. 0 otherwise. 
    558558 * - url:       The URL to which this menu item points. 
    559559 * - title:     The title of this menu item. 
  • trunk/wp-includes/pluggable.php

    r19030 r19593  
    112112 * @since 2.8.0 
    113113 * 
    114  * @param string $field The field to retrieve the user with.  id | slug | email | login 
    115  * @param int|string $value A value for $field.  A user ID, slug, email address, or login name. 
     114 * @param string $field The field to retrieve the user with. id | slug | email | login 
     115 * @param int|string $value A value for $field. A user ID, slug, email address, or login name. 
    116116 * @return bool|object False on failure, WP_User object on success 
    117117 */ 
  • trunk/wp-includes/plugin.php

    r19376 r19593  
    8181 * 
    8282 * @param string $tag The name of the filter hook. 
    83  * @param callback $function_to_check optional.  If specified, return the priority of that function on this hook or false if not attached. 
     83 * @param callback $function_to_check optional. If specified, return the priority of that function on this hook or false if not attached. 
    8484 * @return int|boolean Optionally returns the priority on that hook for the specified function. 
    8585 */ 
     
    500500 * 
    501501 * @param string $tag The name of the action hook. 
    502  * @param callback $function_to_check optional.  If specified, return the priority of that function on this hook or false if not attached. 
     502 * @param callback $function_to_check optional. If specified, return the priority of that function on this hook or false if not attached. 
    503503 * @return int|boolean Optionally returns the priority on that hook for the specified function. 
    504504 */ 
     
    745745 * @param string $tag Used in counting how many hooks were applied 
    746746 * @param callback $function Used for creating unique id 
    747  * @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. 
     747 * @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. 
    748748 * @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. 
    749749 */ 
  • trunk/wp-includes/post-template.php

    r19240 r19593  
    556556 * @since 2.7.0 
    557557 * 
    558  * @param int|object $post An optional post.  Global $post used if not provided. 
     558 * @param int|object $post An optional post. Global $post used if not provided. 
    559559 * @return bool false if a password is not required or the correct password cookie is present, true otherwise. 
    560560 */ 
     
    13081308 * Second argument controls parameters: 
    13091309 *   (bool)   parent : include the parent (the "Current Revision") in the list. 
    1310  *   (string) format : 'list' or 'form-table'.  'list' outputs UL, 'form-table' 
     1310 *   (string) format : 'list' or 'form-table'. 'list' outputs UL, 'form-table' 
    13111311 *                     outputs TABLE with UI. 
    13121312 *   (int)    right  : what revision is currently being viewed - used in 
  • trunk/wp-includes/post-thumbnail-template.php

    r19029 r19593  
    4040 * @since 2.9.0 
    4141 * 
    42  * @param int $size Optional. Image size.  Defaults to 'post-thumbnail', which theme sets using set_post_thumbnail_size( $width, $height, $crop_flag );. 
     42 * @param int $size Optional. Image size. Defaults to 'post-thumbnail', which theme sets using set_post_thumbnail_size( $width, $height, $crop_flag );. 
    4343 * @param string|array $attr Optional. Query string or array of attributes. 
    4444 */ 
     
    8383 * 
    8484 * @param int $post_id Optional. Post ID. 
    85  * @param string $size Optional. Image size.  Defaults to 'thumbnail'. 
     85 * @param string $size Optional. Image size. Defaults to 'thumbnail'. 
    8686 * @param string|array $attr Optional. Query string or array of attributes. 
    8787 */ 
  • trunk/wp-includes/post.php

    r19444 r19593  
    494494 * @param int|object $post A post 
    495495 * 
    496  * @return mixed The format if successful. False if no format is set.  WP_Error if errors. 
     496 * @return mixed The format if successful. False if no format is set. WP_Error if errors. 
    497497 */ 
    498498function get_post_format( $post = null ) { 
     
    532532 * 
    533533 * @param int|object $post The post for which to assign a format 
    534  * @param string $format  A format to assign.  Use an empty string or array to remove all formats from the post. 
     534 * @param string $format  A format to assign. Use an empty string or array to remove all formats from the post. 
    535535 * @return mixed WP_Error on error. Array of affected term IDs on success. 
    536536 */ 
     
    888888 *     for documentation. Defaults to none. 
    889889 * - register_meta_box_cb - Provide a callback function that will be called when setting up the 
    890  *     meta boxes for the edit form.  Do remove_meta_box() and add_meta_box() calls in the callback. 
     890 *     meta boxes for the edit form. Do remove_meta_box() and add_meta_box() calls in the callback. 
    891891 * - taxonomies - An array of taxonomy identifiers that will be registered for the post type. 
    892892 *     Default is no taxonomies. Taxonomies can be registered later with register_taxonomy() or 
     
    953953        $args->show_in_admin_bar = true === $args->show_in_menu; 
    954954 
    955     // Whether to show this type in nav-menus.php.  Defaults to the setting for public. 
     955    // Whether to show this type in nav-menus.php. Defaults to the setting for public. 
    956956    if ( null === $args->show_in_nav_menus ) 
    957957        $args->show_in_nav_menus = $args->public; 
     
    20062006    } 
    20072007 
    2008     // Do raw query.  wp_get_post_revisions() is filtered 
     2008    // Do raw query. wp_get_post_revisions() is filtered 
    20092009    $revision_ids = $wpdb->get_col( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_parent = %d AND post_type = 'revision'", $postid ) ); 
    2010     // Use wp_delete_post (via wp_delete_post_revision) again.  Ensures any meta/misplaced data gets cleaned up. 
     2010    // Use wp_delete_post (via wp_delete_post_revision) again. Ensures any meta/misplaced data gets cleaned up. 
    20112011    foreach ( $revision_ids as $revision_id ) 
    20122012        wp_delete_post_revision( $revision_id ); 
     
    24832483        $post_name = ''; 
    24842484 
    2485     // Create a valid post name.  Drafts and pending posts are allowed to have an empty 
     2485    // Create a valid post name. Drafts and pending posts are allowed to have an empty 
    24862486    // post name. 
    24872487    if ( empty($post_name) ) { 
     
    41514151 * @since 3.0.0 
    41524152 * @param string $post_type Post type. 
    4153  * @param bool $full Optional.  Returns a full WHERE statement instead of just an 'andalso' term. 
    4154  * @param int $post_author Optional.  Query posts having a single author ID. 
     4153 * @param bool $full Optional. Returns a full WHERE statement instead of just an 'andalso' term. 
     4154 * @param int $post_author Optional. Query posts having a single author ID. 
    41554155 * @return string SQL WHERE code that can be added to a query. 
    41564156 */ 
     
    49034903 * @param int|object $post Post ID or post object 
    49044904 * @param string $output Optional. OBJECT, ARRAY_A, or ARRAY_N. 
    4905  * @param string $filter Optional sanitation filter.  @see sanitize_post() 
     4905 * @param string $filter Optional sanitation filter. @see sanitize_post() 
    49064906 * @return mixed Null if error or post object if success 
    49074907 */ 
     
    51115111        return 0; 
    51125112 
    5113     // There's a loop, but it doesn't contain $post_ID.  Break the loop. 
     5113    // There's a loop, but it doesn't contain $post_ID. Break the loop. 
    51145114    foreach ( array_keys( $loop ) as $loop_member ) 
    51155115        wp_update_post( array( 'ID' => $loop_member, 'post_parent' => 0 ) ); 
  • trunk/wp-includes/query.php

    r19444 r19593  
    3030 
    3131/** 
    32  * Retrieve the currently-queried object.  Wrapper for $wp_query->get_queried_object() 
     32 * Retrieve the currently-queried object. Wrapper for $wp_query->get_queried_object() 
    3333 * 
    3434 * @uses WP_Query::get_queried_object 
     
    729729 
    730730/* 
    731  * The Loop.  Post loop control. 
     731 * The Loop. Post loop control. 
    732732 */ 
    733733 
     
    12621262 
    12631263    /** 
    1264      * Whether query vars have changed since the initial parse_query() call.  Used to catch modifications to query vars made 
     1264     * Whether query vars have changed since the initial parse_query() call. Used to catch modifications to query vars made 
    12651265     * via pre_get_posts hooks. 
    12661266     * 
     
    14551455        if ( '' !== $qv['second'] ) $qv['second'] = absint($qv['second']); 
    14561456 
    1457         // Compat.  Map subpost to attachment. 
     1457        // Compat. Map subpost to attachment. 
    14581458        if ( '' != $qv['subpost'] ) 
    14591459            $qv['attachment'] = $qv['subpost']; 
     
    14781478            $this->is_single = false; 
    14791479        } else { 
    1480         // Look for archive queries.  Dates, categories, authors, search, post type archives. 
     1480        // Look for archive queries. Dates, categories, authors, search, post type archives. 
    14811481 
    14821482            if ( !empty($qv['s']) ) { 
     
    24502450            if ( !empty($r_status) ) { 
    24512451                if ( !empty($q['perm'] ) && 'editable' == $q['perm'] && !current_user_can($edit_others_cap) ) 
    2452                     $statuswheres[] = "($wpdb->posts.post_author = $user_ID " .  "AND (" . join( ' OR ', $r_status ) . "))"; 
     2452                    $statuswheres[] = "($wpdb->posts.post_author = $user_ID " . "AND (" . join( ' OR ', $r_status ) . "))"; 
    24532453                else 
    24542454                    $statuswheres[] = "(" . join( ' OR ', $r_status ) . ")"; 
     
    24562456            if ( !empty($p_status) ) { 
    24572457                if ( !empty($q['perm'] ) && 'readable' == $q['perm'] && !current_user_can($read_private_cap) ) 
    2458                     $statuswheres[] = "($wpdb->posts.post_author = $user_ID " .  "AND (" . join( ' OR ', $p_status ) . "))"; 
     2458                    $statuswheres[] = "($wpdb->posts.post_author = $user_ID " . "AND (" . join( ' OR ', $p_status ) . "))"; 
    24592459                else 
    24602460                    $statuswheres[] = "(" . join( ' OR ', $p_status ) . ")"; 
     
    25652565        $pieces = array( 'where', 'groupby', 'join', 'orderby', 'distinct', 'fields', 'limits' ); 
    25662566 
    2567         // Apply post-paging filters on where and join.  Only plugins that 
     2567        // Apply post-paging filters on where and join. Only plugins that 
    25682568        // manipulate paging queries should use these hooks. 
    25692569        if ( !$q['suppress_filters'] ) { 
     
    25822582        } 
    25832583 
    2584         // Announce current selection parameters.  For use by caching plugins. 
     2584        // Announce current selection parameters. For use by caching plugins. 
    25852585        do_action( 'posts_selection', $where . $groupby . $orderby . $limits . $join ); 
    25862586 
    2587         // Filter again for the benefit of caching plugins.  Regular plugins should use the hooks above. 
     2587        // Filter again for the benefit of caching plugins. Regular plugins should use the hooks above. 
    25882588        if ( !$q['suppress_filters'] ) { 
    25892589            $where      = apply_filters_ref_array( 'posts_where_request',       array( $where, &$this ) ); 
     
    26322632        $this->posts = $wpdb->get_results($this->request); 
    26332633 
    2634         // Raw results filter.  Prior to status checks. 
     2634        // Raw results filter. Prior to status checks. 
    26352635        if ( !$q['suppress_filters'] ) 
    26362636            $this->posts = apply_filters_ref_array('posts_results', array( $this->posts, &$this ) ); 
     
    27012701                    // Move to front, after other stickies 
    27022702                    array_splice($this->posts, $sticky_offset, 0, array($sticky_post)); 
    2703                     // Increment the sticky offset.  The next sticky will be placed at this offset. 
     2703                    // Increment the sticky offset. The next sticky will be placed at this offset. 
    27042704                    $sticky_offset++; 
    27052705                    // Remove post from sticky posts array 
  • trunk/wp-includes/rewrite.php

    r19322 r19593  
    11901190        foreach ( (array) $this->feeds as $feed_name) 
    11911191            $feedregex2 .= $feed_name . '|'; 
    1192         $feedregex2 = '(' . trim($feedregex2, '|') .  ')/?$'; 
     1192        $feedregex2 = '(' . trim($feedregex2, '|') . ')/?$'; 
    11931193 
    11941194        //$feedregex is identical but with /feed/ added on as well, so URLs like <permalink>/feed/atom 
    11951195        //and <permalink>/atom are both possible 
    1196         $feedregex = $this->feed_base  . '/' . $feedregex2; 
     1196        $feedregex = $this->feed_base . '/' . $feedregex2; 
    11971197 
    11981198        //build a regex to match the trackback and page/xx parts of URLs 
  • trunk/wp-includes/rss-functions.php

    r12535 r19593  
    11<?php 
    22/** 
    3  * Deprecated.  Use rss.php instead. 
     3 * Deprecated. Use rss.php instead. 
    44 * 
    55 * @package WordPress 
  • trunk/wp-includes/taxonomy.php

    r19077 r19593  
    10841084 * terms whose count is 0 according to the given taxonomy. 
    10851085 * 
    1086  * exclude - Default is an empty array.  An array, comma- or space-delimited string 
    1087  * of term ids to exclude from the return array.  If 'include' is non-empty, 
     1086 * exclude - Default is an empty array. An array, comma- or space-delimited string 
     1087 * of term ids to exclude from the return array. If 'include' is non-empty, 
    10881088 * 'exclude' is ignored. 
    10891089 * 
    1090  * exclude_tree - Default is an empty array.  An array, comma- or space-delimited 
     1090 * exclude_tree - Default is an empty array. An array, comma- or space-delimited 
    10911091 * string of term ids to exclude from the return array, along with all of their 
    1092  * descendant terms according to the primary taxonomy.  If 'include' is non-empty, 
     1092 * descendant terms according to the primary taxonomy. If 'include' is non-empty, 
    10931093 * 'exclude_tree' is ignored. 
    10941094 * 
    1095  * include - Default is an empty array.  An array, comma- or space-delimited string 
     1095 * include - Default is an empty array. An array, comma- or space-delimited string 
    10961096 * of term ids to include in the return array. 
    10971097 * 
    1098  * number - The maximum number of terms to return.  Default is to return them all. 
     1098 * number - The maximum number of terms to return. Default is to return them all. 
    10991099 * 
    11001100 * offset - The number by which to offset the terms query. 
     
    11101110 * 
    11111111 * search - Returned terms' names will contain the value of 'search', 
    1112  * case-insensitive.  Default is an empty string. 
     1112 * case-insensitive. Default is an empty string. 
    11131113 * 
    11141114 * name__like - Returned terms' names will begin with the value of 'name__like', 
     
    11211121 * returns terms regardless of ancestry or whether the terms are empty. 
    11221122 * 
    1123  * The 'child_of' argument, when used, should be set to the integer of a term ID.  Its default 
    1124  * is 0.  If set to a non-zero value, all returned terms will be descendants 
    1125  * of that term according to the given taxonomy.  Hence 'child_of' is set to 0 
     1123 * The 'child_of' argument, when used, should be set to the integer of a term ID. Its default 
     1124 * is 0. If set to a non-zero value, all returned terms will be descendants 
     1125 * of that term according to the given taxonomy. Hence 'child_of' is set to 0 
    11261126 * if more than one taxonomy is passed in $taxonomies, because multiple taxonomies 
    11271127 * make term ancestry ambiguous. 
    11281128 * 
    1129  * The 'parent' argument, when used, should be set to the integer of a term ID.  Its default is 
     1129 * The 'parent' argument, when used, should be set to the integer of a term ID. Its default is 
    11301130 * the empty string '', which has a different meaning from the integer 0. 
    11311131 * If set to an integer value, all returned terms will have as an immediate 
     
    30953095 * @param int $object_id ID of the object (post ID, link ID, ...) 
    30963096 * @param string $taxonomy Single taxonomy name 
    3097  * @param int|string|array $terms Optional.  Term term_id, name, slug or array of said 
     3097 * @param int|string|array $terms Optional. Term term_id, name, slug or array of said 
    30983098 * @return bool|WP_Error. WP_Error on input error. 
    30993099 */ 
     
    32413241        return 0; 
    32423242 
    3243     // There's a loop, but it doesn't contain $term_id.  Break the loop. 
     3243    // There's a loop, but it doesn't contain $term_id. Break the loop. 
    32443244    foreach ( array_keys( $loop ) as $loop_member ) 
    32453245        wp_update_term( $loop_member, $taxonomy, array( 'parent' => 0 ) ); 
  • trunk/wp-includes/theme.php

    r19287 r19593  
    394394            $stylesheet_dir = '/'; 
    395395 
    396         // Check for theme name collision.  This occurs if a theme is copied to 
    397         // a new theme directory and the theme header is not updated.  Whichever 
    398         // theme is first keeps the name.  Subsequent themes get a suffix applied. 
     396        // Check for theme name collision. This occurs if a theme is copied to 
     397        // a new theme directory and the theme header is not updated. Whichever 
     398        // theme is first keeps the name. Subsequent themes get a suffix applied. 
    399399        // The Twenty Eleven, Twenty Ten, Default and Classic themes always trump 
    400400        // their pretenders. 
     
    19431943        case 'post-thumbnails': 
    19441944            // post-thumbnails can be registered for only certain content/post types by passing 
    1945             // an array of types to add_theme_support().  If no array was passed, then 
     1945            // an array of types to add_theme_support(). If no array was passed, then 
    19461946            // any type is accepted 
    19471947            if ( true === $_wp_theme_features[$feature] )  // Registered for all types 
  • trunk/wp-includes/user.php

    r19209 r19593  
    829829 * 
    830830 * Assumes there are neither duplicated nor orphaned capabilities meta_values. 
    831  * Assumes role names are unique phrases.  Same assumption made by WP_User_Query::prepare_query() 
     831 * Assumes role names are unique phrases. Same assumption made by WP_User_Query::prepare_query() 
    832832 * Using $strategy = 'time' this is CPU-intensive and should handle around 10^7 users. 
    833833 * Using $strategy = 'memory' this is memory-intensive and should handle around 10^5 users, but see WP Bug #12257. 
     
    974974 * <li>class - Class attribute of select element.</li> 
    975975 * <li>blog_id - ID of blog (Multisite only). Defaults to ID of current blog.</li> 
    976  * <li>who - Which users to query.  Currently only 'authors' is supported. Default is all users.</li> 
     976 * <li>who - Which users to query. Currently only 'authors' is supported. Default is all users.</li> 
    977977 * </ol> 
    978978 * 
  • trunk/wp-includes/wp-db.php

    r19288 r19593  
    11921192     * 
    11931193     * @param string $table table name 
    1194      * @param array $data Data to insert (in column => value pairs).  Both $data columns and $data values should be "raw" (neither should be SQL escaped). 
     1194     * @param array $data Data to insert (in column => value pairs). Both $data columns and $data values should be "raw" (neither should be SQL escaped). 
    11951195     * @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. 
    11961196     *  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. 
     
    12351235     * @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. 
    12361236     *  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. 
    1237      * @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. 
     1237     * @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. 
    12381238     * @return int|false The number of rows updated, or false on error. 
    12391239     */ 
     
    12791279     * 
    12801280     * @param string|null $query Optional. SQL query. Defaults to null, use the result from the previous query. 
    1281      * @param int $x Optional. Column of value to return.  Indexed from 0. 
    1282      * @param int $y Optional. Row of value to return.  Indexed from 0. 
     1281     * @param int $x Optional. Column of value to return. Indexed from 0. 
     1282     * @param int $y Optional. Row of value to return. Indexed from 0. 
    12831283     * @return string|null Database query result (as string), or null on failure 
    12841284     */ 
     
    13661366     * @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. 
    13671367     *  Each row is an associative array (column => value, ...), a numerically indexed array (0 => value, ...), or an object. ( ->column = value ), respectively. 
    1368      *  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. 
     1368     *  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. 
    13691369     * @return mixed Database query results 
    13701370     */ 
  • trunk/wp-includes/wp-diff.php

    r17781 r19593  
    203203 
    204204        // Does the aforementioned additional processing 
    205         // *_matches tell what rows are "the same" in orig and final.  Those pairs will be diffed to get word changes 
     205        // *_matches tell what rows are "the same" in orig and final. Those pairs will be diffed to get word changes 
    206206        //  match is numeric: an index in other column 
    207         //  match is 'X': no match.  It is a new row 
     207        //  match is 'X': no match. It is a new row 
    208208        // *_rows are column vectors for the orig column and the final column. 
    209209        //  row >= 0: an indix of the $orig or $final array 
     
    232232                    $diff_ratio = $stripped_matches / $stripped_diff; 
    233233                    if ( $diff_ratio > $this->_diff_threshold ) 
    234                         continue; // Too different.  Don't save diffs. 
     234                        continue; // Too different. Don't save diffs. 
    235235                } 
    236236 
     
    242242 
    243243        foreach ( array_keys($orig_rows) as $row ) { 
    244             // Both columns have blanks.  Ignore them. 
     244            // Both columns have blanks. Ignore them. 
    245245            if ( $orig_rows[$row] < 0 && $final_rows[$row] < 0 ) 
    246246                continue; 
    247247 
    248             // If we have a word based diff, use it.  Otherwise, use the normal line. 
     248            // If we have a word based diff, use it. Otherwise, use the normal line. 
    249249            if ( isset( $orig_diffs[$orig_rows[$row]] ) ) 
    250250                $orig_line = $orig_diffs[$orig_rows[$row]]; 
     
    261261                $final_line = ''; 
    262262 
    263             if ( $orig_rows[$row] < 0 ) { // Orig is blank.  This is really an added row. 
     263            if ( $orig_rows[$row] < 0 ) { // Orig is blank. This is really an added row. 
    264264                $r .= $this->_added( array($final_line), false ); 
    265             } elseif ( $final_rows[$row] < 0 ) { // Final is blank.  This is really a deleted row. 
     265            } elseif ( $final_rows[$row] < 0 ) { // Final is blank. This is really a deleted row. 
    266266                $r .= $this->_deleted( array($orig_line), false ); 
    267267            } else { // A true changed row. 
     
    289289    function interleave_changed_lines( $orig, $final ) { 
    290290 
    291         // Contains all pairwise string comparisons.  Keys are such that this need only be a one dimensional array. 
     291        // Contains all pairwise string comparisons. Keys are such that this need only be a one dimensional array. 
    292292        $matches = array(); 
    293293        foreach ( array_keys($orig) as $o ) { 
     
    310310                continue; 
    311311 
    312             // First match for these guys.  Must be best match 
     312            // First match for these guys. Must be best match 
    313313            if ( !isset($orig_matches[$o]) && !isset($final_matches[$f]) ) { 
    314314                $orig_matches[$o] = $f; 
     
    343343            if ( false === $final_pos ) { // This orig is paired with a blank final. 
    344344                array_splice( $final_rows, $orig_pos, 0, -1 ); 
    345             } elseif ( $final_pos < $orig_pos ) { // This orig's match is up a ways.  Pad final with blank rows. 
     345            } elseif ( $final_pos < $orig_pos ) { // This orig's match is up a ways. Pad final with blank rows. 
    346346                $diff_pos = $final_pos - $orig_pos; 
    347347                while ( $diff_pos < 0 ) 
    348348                    array_splice( $final_rows, $orig_pos, 0, $diff_pos++ ); 
    349             } elseif ( $final_pos > $orig_pos ) { // This orig's match is down a ways.  Pad orig with blank rows. 
     349            } elseif ( $final_pos > $orig_pos ) { // This orig's match is down a ways. Pad orig with blank rows. 
    350350                $diff_pos = $orig_pos - $final_pos; 
    351351                while ( $diff_pos < 0 ) 
     
    428428        $difference = array_sum( array_map( array(&$this, 'difference'), $chars1, $chars2 ) ); 
    429429 
    430         // $string1 has zero length? Odd.  Give huge penalty by not dividing. 
     430        // $string1 has zero length? Odd. Give huge penalty by not dividing. 
    431431        if ( !$string1 ) 
    432432            return $difference; 
  • trunk/wp-login.php

    r19414 r19593  
    561561 
    562562    // 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 
    563     // 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 
     563    // 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 
    564564    // the admin via http or https. 
    565565    if ( !$secure_cookie && is_ssl() && force_ssl_login() && !force_ssl_admin() && ( 0 !== strpos($redirect_to, 'https') ) && ( 0 === strpos($redirect_to, 'http') ) ) 
  • trunk/wp-mail.php

    r18513 r19593  
    162162        $post_status = ( $user->has_cap('publish_posts') ) ? 'publish' : 'pending'; 
    163163    } else { 
    164         // Author not found in DB, set status to pending.  Author already set to admin. 
     164        // Author not found in DB, set status to pending. Author already set to admin. 
    165165        $post_status = 'pending'; 
    166166    } 
     
    227227        exit; 
    228228    } else { 
    229         echo '<p>' . sprintf(__('Mission complete.  Message <strong>%s</strong> deleted.'), $i) . '</p>'; 
     229        echo '<p>' . sprintf(__('Mission complete. Message <strong>%s</strong> deleted.'), $i) . '</p>'; 
    230230    } 
    231231 
  • trunk/wp-signup.php

    r19304 r19593  
    219219    <h2><?php printf( __( 'The site %s is yours.' ), "<a href='http://{$domain}{$path}'>{$blog_title}</a>" ) ?></h2> 
    220220    <p> 
    221         <?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 ) ?> 
     221        <?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 ) ?> 
    222222    </p> 
    223223    <?php 
Note: See TracChangeset for help on using the changeset viewer.