From 07ff8b216b944986e0f268f099cbac6dd27901ff Mon Sep 17 00:00:00 2001 From: ryan Date: Tue, 13 Dec 2011 23:45:31 +0000 Subject: [PATCH] Use one space, not two, after trailing punctuation. fixes #19537 git-svn-id: http://svn.automattic.com/wordpress/trunk@19593 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-activate.php | 4 +-- wp-admin/admin-ajax.php | 2 +- wp-admin/custom-header.php | 4 +-- wp-admin/edit-form-advanced.php | 2 +- wp-admin/edit-tags.php | 2 +- wp-admin/import.php | 2 +- .../includes/class-wp-filesystem-direct.php | 2 +- .../includes/class-wp-ms-sites-list-table.php | 2 +- .../includes/class-wp-ms-users-list-table.php | 2 +- .../includes/class-wp-terms-list-table.php | 2 +- .../includes/class-wp-themes-list-table.php | 2 +- wp-admin/includes/class-wp-upgrader.php | 4 +-- .../includes/class-wp-users-list-table.php | 4 +-- wp-admin/includes/dashboard.php | 4 +-- wp-admin/includes/deprecated.php | 4 +-- wp-admin/includes/file.php | 4 +-- wp-admin/includes/image-edit.php | 2 +- wp-admin/includes/image.php | 2 +- wp-admin/includes/ms.php | 4 +-- wp-admin/includes/plugin-install.php | 2 +- wp-admin/includes/plugin.php | 10 +++---- wp-admin/includes/post.php | 4 +-- wp-admin/includes/schema.php | 2 +- wp-admin/includes/screen.php | 8 +++--- wp-admin/includes/taxonomy.php | 4 +-- wp-admin/includes/theme.php | 2 +- wp-admin/includes/upgrade.php | 18 ++++++------ wp-admin/install.php | 2 +- wp-admin/js/common.dev.js | 2 +- wp-admin/maint/repair.php | 10 +++---- wp-admin/network/settings.php | 2 +- wp-admin/network/site-info.php | 2 +- wp-admin/network/site-settings.php | 2 +- wp-admin/network/site-themes.php | 2 +- wp-admin/network/site-users.php | 2 +- wp-admin/options-discussion.php | 4 +-- wp-admin/options-general.php | 2 +- wp-admin/options-writing.php | 2 +- wp-admin/plugin-editor.php | 2 +- wp-admin/plugins.php | 2 +- wp-admin/themes.php | 2 +- wp-admin/update-core.php | 4 +-- wp-admin/upgrade.php | 2 +- wp-admin/user-new.php | 6 ++-- wp-admin/users.php | 2 +- wp-app.php | 4 +-- wp-includes/admin-bar.php | 2 +- wp-includes/cache.php | 10 +++---- wp-includes/capabilities.php | 2 +- wp-includes/class-http.php | 4 +-- wp-includes/class-wp-xmlrpc-server.php | 8 +++--- wp-includes/class-wp.php | 6 ++-- wp-includes/class.wp-dependencies.php | 8 +++--- wp-includes/class.wp-scripts.php | 4 +-- wp-includes/comment-template.php | 18 ++++++------ wp-includes/comment.php | 10 +++---- wp-includes/cron.php | 2 +- wp-includes/default-constants.php | 4 +-- wp-includes/formatting.php | 2 +- wp-includes/functions.php | 8 +++--- wp-includes/general-template.php | 4 +-- wp-includes/http.php | 2 +- wp-includes/js/autosave.dev.js | 2 +- wp-includes/kses.php | 4 +-- wp-includes/link-template.php | 4 +-- wp-includes/load.php | 2 +- wp-includes/locale.php | 2 +- wp-includes/media.php | 4 +-- wp-includes/meta.php | 28 +++++++++---------- wp-includes/ms-functions.php | 2 +- wp-includes/nav-menu-template.php | 6 ++-- wp-includes/nav-menu.php | 2 +- wp-includes/pluggable.php | 4 +-- wp-includes/plugin.php | 6 ++-- wp-includes/post-template.php | 4 +-- wp-includes/post-thumbnail-template.php | 4 +-- wp-includes/post.php | 22 +++++++-------- wp-includes/query.php | 24 ++++++++-------- wp-includes/rewrite.php | 4 +-- wp-includes/rss-functions.php | 2 +- wp-includes/taxonomy.php | 26 ++++++++--------- wp-includes/theme.php | 8 +++--- wp-includes/user.php | 4 +-- wp-includes/wp-db.php | 10 +++---- wp-includes/wp-diff.php | 24 ++++++++-------- wp-login.php | 2 +- wp-mail.php | 4 +-- wp-signup.php | 2 +- 88 files changed, 230 insertions(+), 230 deletions(-) diff --git a/wp-activate.php b/wp-activate.php index 4f72070943..d470772ff6 100644 --- a/wp-activate.php +++ b/wp-activate.php @@ -63,9 +63,9 @@ get_header(); '; if ( $signup->domain . $signup->path == '' ) { - printf( __('Your account has been activated. You may now log in to the site using your chosen username of “%2$s”. 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 reset your password.'), network_site_url( 'wp-login.php', 'login' ), $signup->user_login, $signup->user_email, wp_lostpassword_url() ); + printf( __('Your account has been activated. You may now log in to the site using your chosen username of “%2$s”. 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 reset your password.'), network_site_url( 'wp-login.php', 'login' ), $signup->user_login, $signup->user_email, wp_lostpassword_url() ); } else { - printf( __('Your site at %2$s is active. You may now log in to your site using your chosen username of “%3$s”. 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 reset your password.'), 'http://' . $signup->domain, $signup->domain, $signup->user_login, $signup->user_email, wp_lostpassword_url() ); + printf( __('Your site at %2$s is active. You may now log in to your site using your chosen username of “%3$s”. 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 reset your password.'), 'http://' . $signup->domain, $signup->domain, $signup->user_login, $signup->user_email, wp_lostpassword_url() ); } echo '

'; } else { diff --git a/wp-admin/admin-ajax.php b/wp-admin/admin-ajax.php index c21c861e4b..6639997106 100644 --- a/wp-admin/admin-ajax.php +++ b/wp-admin/admin-ajax.php @@ -970,7 +970,7 @@ case 'autosave' : // The name of this action is hardcoded in edit_post() // Drafts and auto-drafts are just overwritten by autosave if ( 'auto-draft' == $post->post_status || 'draft' == $post->post_status ) { $id = edit_post(); - } else { // Non drafts are not overwritten. The autosave is stored in a special post revision. + } else { // Non drafts are not overwritten. The autosave is stored in a special post revision. $revision_id = wp_create_post_autosave( $post->ID ); if ( is_wp_error($revision_id) ) $id = $revision_id; diff --git a/wp-admin/custom-header.php b/wp-admin/custom-header.php index ebeb2a5ad7..fc6a5f00a3 100644 --- a/wp-admin/custom-header.php +++ b/wp-admin/custom-header.php @@ -676,7 +676,7 @@ wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' ); ?> $oitar = $width / HEADER_IMAGE_WIDTH; $image = wp_crop_image($file, 0, 0, $width, $height, HEADER_IMAGE_WIDTH, $height / $oitar, false, str_replace(basename($file), 'midsize-'.basename($file), $file)); if ( is_wp_error( $image ) ) - wp_die( __( 'Image could not be processed. Please go back and try again.' ), __( 'Image Processing Error' ) ); + wp_die( __( 'Image could not be processed. Please go back and try again.' ), __( 'Image Processing Error' ) ); $image = apply_filters('wp_create_file_in_uploads', $image, $id); // For replication @@ -737,7 +737,7 @@ wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' ); ?> $cropped = wp_crop_image( $attachment_id, (int) $_POST['x1'], (int) $_POST['y1'], (int) $_POST['width'], (int) $_POST['height'], HEADER_IMAGE_WIDTH, HEADER_IMAGE_HEIGHT ); if ( is_wp_error( $cropped ) ) - wp_die( __( 'Image could not be processed. Please go back and try again.' ), __( 'Image Processing Error' ) ); + wp_die( __( 'Image could not be processed. Please go back and try again.' ), __( 'Image Processing Error' ) ); $cropped = apply_filters('wp_create_file_in_uploads', $cropped, $attachment_id); // For replication diff --git a/wp-admin/edit-form-advanced.php b/wp-admin/edit-form-advanced.php index ec6f4ca389..b6fa5dccb1 100644 --- a/wp-admin/edit-form-advanced.php +++ b/wp-admin/edit-form-advanced.php @@ -87,7 +87,7 @@ $form_extra .= "post_modified_gmt, false ) > mysql2date( 'U', $post->post_modified_gmt, false ) ) { foreach ( _wp_post_revision_fields() as $autosave_field => $_autosave_field ) { if ( normalize_whitespace( $autosave->$autosave_field ) != normalize_whitespace( $post->$autosave_field ) ) { - $notice = sprintf( __( 'There is an autosave of this post that is more recent than the version below. View the autosave' ), get_edit_post_link( $autosave->ID ) ); + $notice = sprintf( __( 'There is an autosave of this post that is more recent than the version below. View the autosave' ), get_edit_post_link( $autosave->ID ) ); break; } } diff --git a/wp-admin/edit-tags.php b/wp-admin/edit-tags.php index fdb64c2479..37116dc684 100644 --- a/wp-admin/edit-tags.php +++ b/wp-admin/edit-tags.php @@ -80,7 +80,7 @@ case 'delete': } $tag_ID = (int) $_REQUEST['tag_ID']; - check_admin_referer( 'delete-tag_' . $tag_ID ); + check_admin_referer( 'delete-tag_' . $tag_ID ); if ( !current_user_can( $tax->cap->delete_terms ) ) wp_die( __( 'Cheatin’ uh?' ) ); diff --git a/wp-admin/import.php b/wp-admin/import.php index f9d813709c..6906636516 100644 --- a/wp-admin/import.php +++ b/wp-admin/import.php @@ -20,7 +20,7 @@ get_current_screen()->add_help_tab( array( 'id' => 'overview', 'title' => __('Overview'), 'content' => '

' . __('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.') . '

' . - '

' . __('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.') . '

', + '

' . __('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.') . '

', ) ); diff --git a/wp-admin/includes/class-wp-filesystem-direct.php b/wp-admin/includes/class-wp-filesystem-direct.php index ebd64b3e82..2e11c56731 100644 --- a/wp-admin/includes/class-wp-filesystem-direct.php +++ b/wp-admin/includes/class-wp-filesystem-direct.php @@ -207,7 +207,7 @@ class WP_Filesystem_Direct extends WP_Filesystem_Base { if ( ! $overwrite && $this->exists($destination) ) return false; - // try using rename first. if that fails (for example, source is read only) try copy + // try using rename first. if that fails (for example, source is read only) try copy if ( @rename($source, $destination) ) return true; diff --git a/wp-admin/includes/class-wp-ms-sites-list-table.php b/wp-admin/includes/class-wp-ms-sites-list-table.php index 73ce88989a..cfe4cfa5f1 100644 --- a/wp-admin/includes/class-wp-ms-sites-list-table.php +++ b/wp-admin/includes/class-wp-ms-sites-list-table.php @@ -251,7 +251,7 @@ class WP_MS_Sites_List_Table extends WP_List_Table { $actions['deactivate'] = '' . __( 'Deactivate' ) . ''; if ( get_blog_status( $blog['blog_id'], 'archived' ) == '1' ) - $actions['unarchive'] = '' . __( 'Unarchive' ) . ''; + $actions['unarchive'] = '' . __( 'Unarchive' ) . ''; else $actions['archive'] = '' . _x( 'Archive', 'verb; site' ) . ''; diff --git a/wp-admin/includes/class-wp-ms-users-list-table.php b/wp-admin/includes/class-wp-ms-users-list-table.php index 4ebec5e74b..a6b5f8a3f3 100644 --- a/wp-admin/includes/class-wp-ms-users-list-table.php +++ b/wp-admin/includes/class-wp-ms-users-list-table.php @@ -242,7 +242,7 @@ class WP_MS_Users_List_Table extends WP_List_Table { if ( get_blog_status( $val->userblog_id, 'archived' ) == 1 ) $class .= 'site-archived '; - $actions['view'] = '' . __( 'View' ) . ''; + $actions['view'] = '' . __( 'View' ) . ''; $actions = apply_filters('ms_user_list_site_actions', $actions, $val->userblog_id); diff --git a/wp-admin/includes/class-wp-terms-list-table.php b/wp-admin/includes/class-wp-terms-list-table.php index d7cb5261fe..0fc0f825b1 100644 --- a/wp-admin/includes/class-wp-terms-list-table.php +++ b/wp-admin/includes/class-wp-terms-list-table.php @@ -42,7 +42,7 @@ class WP_Terms_List_Table extends WP_List_Table { function prepare_items() { global $taxonomy; - $tags_per_page = $this->get_items_per_page( 'edit_' . $taxonomy . '_per_page' ); + $tags_per_page = $this->get_items_per_page( 'edit_' . $taxonomy . '_per_page' ); if ( 'post_tag' == $taxonomy ) { $tags_per_page = apply_filters( 'edit_tags_per_page', $tags_per_page ); diff --git a/wp-admin/includes/class-wp-themes-list-table.php b/wp-admin/includes/class-wp-themes-list-table.php index 4839b504e2..47d51554ef 100644 --- a/wp-admin/includes/class-wp-themes-list-table.php +++ b/wp-admin/includes/class-wp-themes-list-table.php @@ -149,7 +149,7 @@ class WP_Themes_List_Table extends WP_List_Table { $activate_link = wp_nonce_url( "themes.php?action=activate&template=".urlencode( $template )."&stylesheet=".urlencode( $stylesheet ), 'switch-theme_' . $template ); $activate_text = esc_attr( sprintf( __( 'Activate “%s”' ), $title ) ); $actions = array(); - $actions[] = '' . __( 'Activate' ) . ''; + $actions[] = '' . __( 'Activate' ) . ''; $actions[] = '' . __( 'Preview' ) . ''; if ( ! is_multisite() && current_user_can( 'delete_themes' ) ) $actions[] = '' . __( 'Delete' ) . ''; diff --git a/wp-admin/includes/class-wp-upgrader.php b/wp-admin/includes/class-wp-upgrader.php index e61e0ef5e4..c5fa3551fd 100644 --- a/wp-admin/includes/class-wp-upgrader.php +++ b/wp-admin/includes/class-wp-upgrader.php @@ -1419,7 +1419,7 @@ class Theme_Installer_Skin extends WP_Upgrader_Skin { $install_actions = array( 'preview' => '' . __('Preview') . '', - 'activate' => '' . __('Activate') . '' + 'activate' => '' . __('Activate') . '' ); if ( is_network_admin() && current_user_can( 'manage_network_themes' ) ) @@ -1475,7 +1475,7 @@ class Theme_Upgrader_Skin extends WP_Upgrader_Skin { $activate_link = wp_nonce_url("themes.php?action=activate&template=" . urlencode($template) . "&stylesheet=" . urlencode($stylesheet), 'switch-theme_' . $template); $update_actions['preview'] = '' . __('Preview') . ''; - $update_actions['activate'] = '' . __('Activate') . ''; + $update_actions['activate'] = '' . __('Activate') . ''; if ( ( ! $this->result || is_wp_error($this->result) ) || $stylesheet == get_stylesheet() ) unset($update_actions['preview'], $update_actions['activate']); diff --git a/wp-admin/includes/class-wp-users-list-table.php b/wp-admin/includes/class-wp-users-list-table.php index 09cb2156cc..8afacd8a22 100644 --- a/wp-admin/includes/class-wp-users-list-table.php +++ b/wp-admin/includes/class-wp-users-list-table.php @@ -209,9 +209,9 @@ class WP_Users_List_Table extends WP_List_Table { * @since 2.1.0 * * @param object $user_object - * @param string $style Optional. Attributes added to the TR element. Must be sanitized. + * @param string $style Optional. Attributes added to the TR element. Must be sanitized. * @param string $role Key for the $wp_roles array. - * @param int $numposts Optional. Post count to display for this user. Defaults to zero, as in, a new user has made zero posts. + * @param int $numposts Optional. Post count to display for this user. Defaults to zero, as in, a new user has made zero posts. * @return string */ function single_row( $user_object, $style = '', $role = '', $numposts = 0 ) { diff --git a/wp-admin/includes/dashboard.php b/wp-admin/includes/dashboard.php index 80be66bd8e..b37ac0cdba 100644 --- a/wp-admin/includes/dashboard.php +++ b/wp-admin/includes/dashboard.php @@ -273,7 +273,7 @@ function wp_dashboard_right_now() { echo ''; /* TODO: Show status breakdown on hover - if ( $can_edit_pages && !empty($num_pages->publish) ) { // how many pages is not exposed in feeds. Don't show if !current_user_can + if ( $can_edit_pages && !empty($num_pages->publish) ) { // how many pages is not exposed in feeds. Don't show if !current_user_can $post_type_texts[] = ''.sprintf( _n( '%s page', '%s pages', $num_pages->publish ), number_format_i18n( $num_pages->publish ) ).''; } if ( $can_edit_posts && !empty($num_posts->draft) ) { @@ -1115,7 +1115,7 @@ function wp_dashboard_rss_control( $widget_id, $form_inputs = array() ) { if ( 'POST' == $_SERVER['REQUEST_METHOD'] && isset($_POST['widget-rss'][$number]) ) { $_POST['widget-rss'][$number] = stripslashes_deep( $_POST['widget-rss'][$number] ); $widget_options[$widget_id] = wp_widget_rss_process( $_POST['widget-rss'][$number] ); - // title is optional. If black, fill it if possible + // title is optional. If black, fill it if possible if ( !$widget_options[$widget_id]['title'] && isset($_POST['widget-rss'][$number]['title']) ) { $rss = fetch_feed($widget_options[$widget_id]['url']); if ( is_wp_error($rss) ) { diff --git a/wp-admin/includes/deprecated.php b/wp-admin/includes/deprecated.php index f38bafc765..c1fbc22a9d 100644 --- a/wp-admin/includes/deprecated.php +++ b/wp-admin/includes/deprecated.php @@ -133,7 +133,7 @@ function wp_dropdown_cats( $currentcat = 0, $currentparent = 0, $parent = 0, $le * @deprecated Use register_setting() * @see register_setting() * - * @param string $option_group A settings group name. Should correspond to a whitelisted option key name. + * @param string $option_group A settings group name. Should correspond to a whitelisted option key name. * Default whitelisted option key names include "general," "discussion," and "reading," among others. * @param string $option_name The name of an option to sanitize and save. * @param unknown_type $sanitize_callback A callback function that sanitizes the option's value. @@ -870,7 +870,7 @@ function type_url_form_file() { * @deprecated Use get_current_screen()->add_help_tab() * @see WP_Screen * - * @param string $screen The handle for the screen to add help to. This is usually the hook name returned by the add_*_page() functions. + * @param string $screen The handle for the screen to add help to. This is usually the hook name returned by the add_*_page() functions. * @param string $help The content of an 'Overview' help tab. */ function add_contextual_help( $screen, $help ) { diff --git a/wp-admin/includes/file.php b/wp-admin/includes/file.php index bf4ac85dc6..3649f555b6 100644 --- a/wp-admin/includes/file.php +++ b/wp-admin/includes/file.php @@ -240,7 +240,7 @@ function wp_handle_upload( &$file, $overrides = false, $time = null ) { // You may define your own function and pass the name in $overrides['upload_error_handler'] $upload_error_handler = 'wp_handle_upload_error'; - // You may have had one or more 'wp_handle_upload_prefilter' functions error out the file. Handle that gracefully. + // You may have had one or more 'wp_handle_upload_prefilter' functions error out the file. Handle that gracefully. if ( isset( $file['error'] ) && !is_numeric( $file['error'] ) && $file['error'] ) return $upload_error_handler( $file, $file['error'] ); @@ -364,7 +364,7 @@ function wp_handle_upload( &$file, $overrides = false, $time = null ) { /** * Handle sideloads, which is the process of retrieving a media item from another server instead of - * a traditional media upload. This process involves sanitizing the filename, checking extensions + * a traditional media upload. This process involves sanitizing the filename, checking extensions * for mime type, and moving the file to the appropriate directory within the uploads directory. * * @since 2.6.0 diff --git a/wp-admin/includes/image-edit.php b/wp-admin/includes/image-edit.php index 0e2027a1ea..ceccab3c2c 100644 --- a/wp-admin/includes/image-edit.php +++ b/wp-admin/includes/image-edit.php @@ -192,7 +192,7 @@ function wp_image_editor($post_id, $msg = false) {
- + 0, diff --git a/wp-admin/includes/ms.php b/wp-admin/includes/ms.php index 1b2c7e78e5..22fb489342 100644 --- a/wp-admin/includes/ms.php +++ b/wp-admin/includes/ms.php @@ -49,7 +49,7 @@ add_filter( 'wp_handle_upload_prefilter', 'check_upload_size' ); * @since 3.0.0 * * @param int $blog_id Blog ID - * @param bool $drop True if blog's table should be dropped. Default is false. + * @param bool $drop True if blog's table should be dropped. Default is false. * @return void */ function wpmu_delete_blog( $blog_id, $drop = false ) { @@ -774,7 +774,7 @@ var tb_closeImage = "../../wp-includes/js/thickbox/tb-close.png"; * Plugins can alter this criteria using the 'wp_is_large_network' filter. * * @since 3.3.0 - * @param string $using 'sites or 'users'. Default is 'sites'. + * @param string $using 'sites or 'users'. Default is 'sites'. * @return bool True if the network meets the criteria for large. False otherwise. */ function wp_is_large_network( $using = 'sites' ) { diff --git a/wp-admin/includes/plugin-install.php b/wp-admin/includes/plugin-install.php index 71cc36dc6b..e1152f9d8e 100644 --- a/wp-admin/includes/plugin-install.php +++ b/wp-admin/includes/plugin-install.php @@ -199,7 +199,7 @@ function install_plugin_install_status($api, $loop = false) { } if ( 'install' == $status ) { - if ( is_dir( WP_PLUGIN_DIR . '/' . $api->slug ) ) { + if ( is_dir( WP_PLUGIN_DIR . '/' . $api->slug ) ) { $installed_plugin = get_plugins('/' . $api->slug); if ( empty($installed_plugin) ) { if ( current_user_can('install_plugins') ) diff --git a/wp-admin/includes/plugin.php b/wp-admin/includes/plugin.php index be97e8c381..c1f0173768 100644 --- a/wp-admin/includes/plugin.php +++ b/wp-admin/includes/plugin.php @@ -985,8 +985,8 @@ function add_submenu_page( $parent_slug, $page_title, $menu_title, $capability, } // If the parent doesn't already have a submenu, add a link to the parent - // as the first item in the submenu. If the submenu file is the same as the - // parent file someone is trying to link back to the parent manually. In + // as the first item in the submenu. If the submenu file is the same as the + // parent file someone is trying to link back to the parent manually. In // this case, don't automatically add a link back to avoid duplication. if (!isset( $submenu[$parent_slug] ) && $menu_slug != $parent_slug ) { foreach ( (array)$menu as $parent_menu ) { @@ -1002,7 +1002,7 @@ function add_submenu_page( $parent_slug, $page_title, $menu_title, $capability, add_action( $hookname, $function ); $_registered_pages[$hookname] = true; - // backwards-compatibility for plugins using add_management page. See wp-admin/admin.php for redirect from edit.php to tools.php + // backwards-compatibility for plugins using add_management page. See wp-admin/admin.php for redirect from edit.php to tools.php if ( 'tools.php' == $parent_slug ) $_registered_pages[get_plugin_page_hookname( $menu_slug, 'edit.php')] = true; @@ -1589,7 +1589,7 @@ function user_can_access_admin_page() { * * @since 2.7.0 * - * @param string $option_group A settings group name. Should correspond to a whitelisted option key name. + * @param string $option_group A settings group name. Should correspond to a whitelisted option key name. * Default whitelisted option key names include "general," "discussion," and "reading," among others. * @param string $option_name The name of an option to sanitize and save. * @param unknown_type $sanitize_callback A callback function that sanitizes the option's value. @@ -1715,7 +1715,7 @@ function remove_option_whitelist( $del_options, $options = '' ) { * * @since 2.7.0 * - * @param string $option_group A settings group name. This should match the group name used in register_setting(). + * @param string $option_group A settings group name. This should match the group name used in register_setting(). */ function settings_fields($option_group) { echo ""; diff --git a/wp-admin/includes/post.php b/wp-admin/includes/post.php index 831c7025ed..024740a60f 100644 --- a/wp-admin/includes/post.php +++ b/wp-admin/includes/post.php @@ -1259,7 +1259,7 @@ function wp_create_post_autosave( $post_id ) { if ( is_wp_error( $translated ) ) return $translated; - // Only store one autosave. If there is already an autosave, overwrite it. + // Only store one autosave. If there is already an autosave, overwrite it. if ( $old_autosave = wp_get_post_autosave( $post_id ) ) { $new_autosave = _wp_post_revision_fields( $_POST, true ); $new_autosave['ID'] = $old_autosave->ID; @@ -1320,7 +1320,7 @@ function post_preview() { if ( 'draft' == $post->post_status ) { $id = edit_post(); - } else { // Non drafts are not overwritten. The autosave is stored in a special post revision. + } else { // Non drafts are not overwritten. The autosave is stored in a special post revision. $id = wp_create_post_autosave( $post->ID ); if ( ! is_wp_error($id) ) $id = $post->ID; diff --git a/wp-admin/includes/schema.php b/wp-admin/includes/schema.php index 687b8fd302..d5f522ec19 100644 --- a/wp-admin/includes/schema.php +++ b/wp-admin/includes/schema.php @@ -30,7 +30,7 @@ if ( ! empty( $wpdb->collate ) ) * @since 3.3.0 * * @param string $scope Optional. The tables for which to retrieve SQL. Can be all, global, ms_global, or blog tables. Defaults to all. - * @param int $blog_id Optional. The blog ID for which to retrieve SQL. Default is the current blog ID. + * @param int $blog_id Optional. The blog ID for which to retrieve SQL. Default is the current blog ID. * @return string The SQL needed to create the requested tables. */ function wp_get_db_schema( $scope = 'all', $blog_id = null ) { diff --git a/wp-admin/includes/screen.php b/wp-admin/includes/screen.php index a182b7453d..703f71a02a 100644 --- a/wp-admin/includes/screen.php +++ b/wp-admin/includes/screen.php @@ -208,7 +208,7 @@ function set_current_screen( $hook_name = '' ) { */ final class WP_Screen { /** - * Any action associated with the screen. 'add' for *-add.php and *-new.php screens. Empty otherwise. + * Any action associated with the screen. 'add' for *-add.php and *-new.php screens. Empty otherwise. * * @since 3.3.0 * @var string @@ -217,7 +217,7 @@ final class WP_Screen { public $action; /** - * The base type of the screen. This is typically the same as $id but with any post types and taxonomies stripped. + * The base type of the screen. This is typically the same as $id but with any post types and taxonomies stripped. * For example, for an $id of 'edit-post' the base is 'edit'. * * @since 3.3.0 @@ -539,7 +539,7 @@ final class WP_Screen { * * @since 3.3.0 * - * @param string $parent_file The parent file of the screen. Typically the $parent_file global. + * @param string $parent_file The parent file of the screen. Typically the $parent_file global. */ function set_parentage( $parent_file ) { $this->parent_file = $parent_file; @@ -809,7 +809,7 @@ final class WP_Screen { $welcome_checked = false; } echo '\n"; } ?> diff --git a/wp-admin/includes/taxonomy.php b/wp-admin/includes/taxonomy.php index 12e231a817..9769ea8c63 100644 --- a/wp-admin/includes/taxonomy.php +++ b/wp-admin/includes/taxonomy.php @@ -86,7 +86,7 @@ function wp_create_categories($categories, $post_id = '') { * * @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. * @param bool $wp_error Optional, since 2.5.0. Set this to true if the caller handles WP_Error return values. - * @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. + * @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. */ function wp_insert_category($catarr, $wp_error = false) { $cat_defaults = array('cat_ID' => 0, 'taxonomy' => 'category', 'cat_name' => '', 'category_description' => '', 'category_nicename' => '', 'category_parent' => ''); @@ -145,7 +145,7 @@ function wp_insert_category($catarr, $wp_error = false) { * * @since 2.0.0 * - * @param array $catarr The 'cat_ID' value is required. All other keys are optional. + * @param array $catarr The 'cat_ID' value is required. All other keys are optional. * @return int|bool The ID number of the new or updated Category on success. Zero or FALSE on failure. */ function wp_update_category($catarr) { diff --git a/wp-admin/includes/theme.php b/wp-admin/includes/theme.php index 7cb5dc4a35..dbc31db68d 100644 --- a/wp-admin/includes/theme.php +++ b/wp-admin/includes/theme.php @@ -253,7 +253,7 @@ function theme_update_available( $theme ) { $theme_name = is_object($theme) ? $theme->name : (is_array($theme) ? $theme['Name'] : ''); $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. $update_url = wp_nonce_url('update.php?action=upgrade-theme&theme=' . urlencode($stylesheet), 'upgrade-theme_' . $stylesheet); - $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;"'; + $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;"'; if ( !is_multisite() ) { if ( ! current_user_can('update_themes') ) diff --git a/wp-admin/includes/upgrade.php b/wp-admin/includes/upgrade.php index 646e1ccb5d..4e47d7d178 100644 --- a/wp-admin/includes/upgrade.php +++ b/wp-admin/includes/upgrade.php @@ -58,8 +58,8 @@ function wp_install( $blog_title, $user_name, $user_email, $public, $deprecated if ( ! $public ) update_option('default_pingback_flag', 0); - // Create default user. If the user already exists, the user tables are - // being shared among blogs. Just set the role in that case. + // Create default user. If the user already exists, the user tables are + // being shared among blogs. Just set the role in that case. $user_id = username_exists($user_name); $user_password = trim($user_password); $email_password = false; @@ -358,7 +358,7 @@ function wp_upgrade() { $wp_current_db_version = __get_option('db_version'); - // We are up-to-date. Nothing to do. + // We are up-to-date. Nothing to do. if ( $wp_db_version == $wp_current_db_version ) return; @@ -394,7 +394,7 @@ function upgrade_all() { global $wp_current_db_version, $wp_db_version, $wp_rewrite; $wp_current_db_version = __get_option('db_version'); - // We are up-to-date. Nothing to do. + // We are up-to-date. Nothing to do. if ( $wp_db_version == $wp_current_db_version ) return; @@ -646,7 +646,7 @@ function upgrade_130() { $active_plugins = __get_option('active_plugins'); // If plugins are not stored in an array, they're stored in the old - // newline separated format. Convert to new format. + // newline separated format. Convert to new format. if ( !is_array( $active_plugins ) ) { $active_plugins = explode("\n", trim($active_plugins)); update_option('active_plugins', $active_plugins); @@ -898,9 +898,9 @@ function upgrade_230() { $wpdb->insert( $wpdb->term_relationships, array('object_id' => $post_id, 'term_taxonomy_id' => $tt_id) ); } - // < 3570 we used linkcategories. >= 3570 we used categories and link2cat. + // < 3570 we used linkcategories. >= 3570 we used categories and link2cat. if ( $wp_current_db_version < 3570 ) { - // Create link_category terms for link categories. Create a map of link cat IDs + // Create link_category terms for link categories. Create a map of link cat IDs // to link_category terms. $link_cat_id_map = array(); $default_link_cat = 0; @@ -1690,7 +1690,7 @@ function make_site_theme_from_oldschool($theme_name, $template) { return false; // Copy files from the old locations to the site theme. - // TODO: This does not copy arbitrary include dependencies. Only the + // TODO: This does not copy arbitrary include dependencies. Only the // standard WP files are copied. $files = array('index.php' => 'index.php', 'wp-layout.css' => 'style.css', 'wp-comments.php' => 'comments.php', 'wp-comments-popup.php' => 'comments-popup.php'); @@ -1938,7 +1938,7 @@ function pre_schema_upgrade() { // Upgrade versions prior to 2.9 if ( $wp_current_db_version < 11557 ) { - // Delete duplicate options. Keep the option with the highest option_id. + // Delete duplicate options. Keep the option with the highest option_id. $wpdb->query("DELETE o1 FROM $wpdb->options AS o1 JOIN $wpdb->options AS o2 USING (`option_name`) WHERE o2.option_id > o1.option_id"); // Drop the old primary key and add the new. diff --git a/wp-admin/install.php b/wp-admin/install.php index edbc8c0136..f29553fa7f 100644 --- a/wp-admin/install.php +++ b/wp-admin/install.php @@ -207,7 +207,7 @@ switch($step) { $error = true; } elseif ( ! is_email( $admin_email ) ) { // TODO: poka-yoke - display_setup_form( __( 'that isn’t a valid e-mail address. E-mail addresses look like: username@example.com' ) ); + display_setup_form( __( 'that isn’t a valid e-mail address. E-mail addresses look like: username@example.com' ) ); $error = true; } diff --git a/wp-admin/js/common.dev.js b/wp-admin/js/common.dev.js index b8ee100ea1..bc9844eea1 100644 --- a/wp-admin/js/common.dev.js +++ b/wp-admin/js/common.dev.js @@ -316,7 +316,7 @@ $(document).ready( function() { var el = e.target, selStart = el.selectionStart, selEnd = el.selectionEnd, val = el.value, scroll, sel; try { - this.lastKey = 9; // not a standard DOM property, lastKey is to help stop Opera tab event. See blur handler below. + this.lastKey = 9; // not a standard DOM property, lastKey is to help stop Opera tab event. See blur handler below. } catch(err) {} if ( document.selection ) { diff --git a/wp-admin/maint/repair.php b/wp-admin/maint/repair.php index 3f5718876d..66e904f156 100644 --- a/wp-admin/maint/repair.php +++ b/wp-admin/maint/repair.php @@ -19,7 +19,7 @@ header( 'Content-Type: text/html; charset=utf-8' ); '.__('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.')."

define('WP_ALLOW_REPAIR', true);"; + echo '

'.__('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.')."

define('WP_ALLOW_REPAIR', true);"; } elseif ( isset($_GET['repair']) ) { check_admin_referer('repair_db'); @@ -49,7 +49,7 @@ if ( !defined('WP_ALLOW_REPAIR') ) { printf( __( 'The %s table is okay.' ), $table ); } else { /* translators: 1: table name, 2: error message, */ - printf( __( 'The %1$s table is not okay. It is reporting the following error: %2$s. WordPress will attempt to repair this table…' ) , $table, "$check->Msg_text" ); + printf( __( 'The %1$s table is not okay. It is reporting the following error: %2$s. WordPress will attempt to repair this table…' ) , $table, "$check->Msg_text" ); $repair = $wpdb->get_row("REPAIR TABLE $table"); @@ -95,16 +95,16 @@ if ( !defined('WP_ALLOW_REPAIR') ) { $problem_output[] = "$table: $problem"; echo ''; } else { - echo '

'.__('Repairs complete. Please remove the following line from wp-config.php to prevent this page from being used by unauthorized users.')."

define('WP_ALLOW_REPAIR', true);"; + echo '

'.__('Repairs complete. Please remove the following line from wp-config.php to prevent this page from being used by unauthorized users.')."

define('WP_ALLOW_REPAIR', true);"; } } else { if ( isset($_GET['referrer']) && 'is_blog_installed' == $_GET['referrer'] ) _e('One or more database tables are unavailable. To allow WordPress to attempt to repair these tables, press the “Repair Database” button. Repairing can take a while, so please be patient.'); else - _e('WordPress can automatically look for some common database problems and repair them. Repairing can take a while, so please be patient.') + _e('WordPress can automatically look for some common database problems and repair them. Repairing can take a while, so please be patient.') ?>

- +

__( 'Plugins' ) ) ); foreach ( (array) $menu_items as $key => $val ) { - echo "
"; + echo "
"; } ?> diff --git a/wp-admin/network/site-info.php b/wp-admin/network/site-info.php index 8cf9a5ee6b..b23979cf4c 100644 --- a/wp-admin/network/site-info.php +++ b/wp-admin/network/site-info.php @@ -108,7 +108,7 @@ $tabs = array( ); foreach ( $tabs as $tab_id => $tab ) { $class = ( $tab['url'] == $pagenow ) ? ' nav-tab-active' : ''; - echo '' . esc_html( $tab['label'] ) . ''; + echo '' . esc_html( $tab['label'] ) . ''; } ?> diff --git a/wp-admin/network/site-settings.php b/wp-admin/network/site-settings.php index 09ebeaad7d..a4be1dfbad 100644 --- a/wp-admin/network/site-settings.php +++ b/wp-admin/network/site-settings.php @@ -98,7 +98,7 @@ $tabs = array( ); foreach ( $tabs as $tab_id => $tab ) { $class = ( $tab['url'] == $pagenow ) ? ' nav-tab-active' : ''; - echo '' . esc_html( $tab['label'] ) . ''; + echo '' . esc_html( $tab['label'] ) . ''; } ?> diff --git a/wp-admin/network/site-themes.php b/wp-admin/network/site-themes.php index 0ff479acb7..44f6fc1ef7 100644 --- a/wp-admin/network/site-themes.php +++ b/wp-admin/network/site-themes.php @@ -152,7 +152,7 @@ $tabs = array( ); foreach ( $tabs as $tab_id => $tab ) { $class = ( $tab['url'] == $pagenow ) ? ' nav-tab-active' : ''; - echo '' . esc_html( $tab['label'] ) . ''; + echo '' . esc_html( $tab['label'] ) . ''; } ?> $tab ) { $class = ( $tab['url'] == $pagenow ) ? ' nav-tab-active' : ''; - echo '' . esc_html( $tab['label'] ) . ''; + echo '' . esc_html( $tab['label'] ) . ''; } ?> -

+

@@ -228,7 +228,7 @@ $size = 32; $avatar_list = ''; foreach ( $avatar_defaults as $default_key => $default_name ) { $selected = ($default == $default_key) ? 'checked="checked" ' : ''; - $avatar_list .= "\n\t