From b1f15796048bca5b658d01ceb99bb6503ba9148d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Helen=20Hou-Sand=C3=AD?= Date: Thu, 20 Dec 2012 15:55:32 +0000 Subject: [PATCH] its <=> it's in documentation, along with a rogue the, The, and looses. props trepmal. fixes #22665. git-svn-id: http://core.svn.wordpress.org/trunk@23191 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/class-wp-filesystem-base.php | 2 +- wp-admin/includes/class-wp-filesystem-direct.php | 2 +- wp-admin/includes/class-wp-filesystem-ftpsockets.php | 2 +- wp-admin/includes/class-wp-list-table.php | 2 +- .../includes/class-wp-plugin-install-list-table.php | 2 +- .../includes/class-wp-theme-install-list-table.php | 2 +- wp-admin/includes/class-wp-upgrader.php | 10 +++++----- wp-admin/includes/class-wp-users-list-table.php | 2 +- wp-admin/includes/file.php | 2 +- wp-admin/includes/plugin.php | 2 +- wp-content/themes/twentyeleven/inc/widgets.php | 2 +- wp-includes/class-http.php | 6 +++--- wp-includes/comment.php | 2 +- wp-includes/deprecated.php | 6 +++--- wp-includes/feed-atom-comments.php | 2 +- wp-includes/js/crop/cropper.css | 2 +- wp-includes/js/tinymce/plugins/wpdialogs/js/popup.js | 4 ++-- .../js/tinymce/plugins/wplink/editor_plugin_src.js | 2 +- wp-includes/ms-blogs.php | 2 +- wp-includes/query.php | 2 +- wp-includes/rss.php | 2 +- wp-includes/theme.php | 2 +- 22 files changed, 31 insertions(+), 31 deletions(-) diff --git a/wp-admin/includes/class-wp-filesystem-base.php b/wp-admin/includes/class-wp-filesystem-base.php index 75808df8a3..a9566c76d5 100644 --- a/wp-admin/includes/class-wp-filesystem-base.php +++ b/wp-admin/includes/class-wp-filesystem-base.php @@ -203,7 +203,7 @@ class WP_Filesystem_Base { continue; //We want this to be caught by the next code block. //Working from /home/ to /user/ to /wordpress/ see if that file exists within the current folder, - // If its found, change into it and follow through looking for it. + // If it's found, change into it and follow through looking for it. // If it cant find WordPress down that route, it'll continue onto the next folder level, and see if that matches, and so on. // If it reaches the end, and still cant find it, it'll return false for the entire function. if ( isset($files[ $key ]) ){ diff --git a/wp-admin/includes/class-wp-filesystem-direct.php b/wp-admin/includes/class-wp-filesystem-direct.php index 457f199c3d..e25c9ef8d7 100644 --- a/wp-admin/includes/class-wp-filesystem-direct.php +++ b/wp-admin/includes/class-wp-filesystem-direct.php @@ -229,7 +229,7 @@ class WP_Filesystem_Direct extends WP_Filesystem_Base { if ( ! $recursive && $this->is_dir($file) ) return @rmdir($file); - //At this point its a folder, and we're in recursive mode + //At this point it's a folder, and we're in recursive mode $file = trailingslashit($file); $filelist = $this->dirlist($file, true); diff --git a/wp-admin/includes/class-wp-filesystem-ftpsockets.php b/wp-admin/includes/class-wp-filesystem-ftpsockets.php index 1c931e1928..728385b70b 100644 --- a/wp-admin/includes/class-wp-filesystem-ftpsockets.php +++ b/wp-admin/includes/class-wp-filesystem-ftpsockets.php @@ -97,7 +97,7 @@ class WP_Filesystem_ftpsockets extends WP_Filesystem_Base { if ( ! $this->ftp->fget($temphandle, $file) ) { fclose($temphandle); unlink($temp); - return ''; //Blank document, File does exist, Its just blank. + return ''; //Blank document, File does exist, It's just blank. } fseek($temphandle, 0); //Skip back to the start of the file being written to diff --git a/wp-admin/includes/class-wp-list-table.php b/wp-admin/includes/class-wp-list-table.php index 8a22bd4e0d..8c91c701da 100644 --- a/wp-admin/includes/class-wp-list-table.php +++ b/wp-admin/includes/class-wp-list-table.php @@ -72,7 +72,7 @@ class WP_List_Table { var $_pagination; /** - * Constructor. The child class should call this constructor from it's own constructor + * Constructor. The child class should call this constructor from its own constructor * * @param array $args An associative array with information about the current table * @access protected diff --git a/wp-admin/includes/class-wp-plugin-install-list-table.php b/wp-admin/includes/class-wp-plugin-install-list-table.php index ca06dbedf9..aa7cffe4c9 100644 --- a/wp-admin/includes/class-wp-plugin-install-list-table.php +++ b/wp-admin/includes/class-wp-plugin-install-list-table.php @@ -40,7 +40,7 @@ class WP_Plugin_Install_List_Table extends WP_List_Table { $tabs = apply_filters( 'install_plugins_tabs', $tabs ); $nonmenu_tabs = apply_filters( 'install_plugins_nonmenu_tabs', $nonmenu_tabs ); - // If a non-valid menu tab has been selected, And its not a non-menu action. + // If a non-valid menu tab has been selected, And it's not a non-menu action. if ( empty( $tab ) || ( !isset( $tabs[ $tab ] ) && !in_array( $tab, (array) $nonmenu_tabs ) ) ) $tab = key( $tabs ); diff --git a/wp-admin/includes/class-wp-theme-install-list-table.php b/wp-admin/includes/class-wp-theme-install-list-table.php index 319a9989f1..8aa892929d 100644 --- a/wp-admin/includes/class-wp-theme-install-list-table.php +++ b/wp-admin/includes/class-wp-theme-install-list-table.php @@ -51,7 +51,7 @@ class WP_Theme_Install_List_Table extends WP_Themes_List_Table { $tabs = apply_filters( 'install_themes_tabs', $tabs ); $nonmenu_tabs = apply_filters( 'install_themes_nonmenu_tabs', $nonmenu_tabs ); - // If a non-valid menu tab has been selected, And its not a non-menu action. + // If a non-valid menu tab has been selected, And it's not a non-menu action. if ( empty( $tab ) || ( ! isset( $tabs[ $tab ] ) && ! in_array( $tab, (array) $nonmenu_tabs ) ) ) $tab = key( $tabs ); diff --git a/wp-admin/includes/class-wp-upgrader.php b/wp-admin/includes/class-wp-upgrader.php index ef8fb5f884..c9bfec3dc4 100644 --- a/wp-admin/includes/class-wp-upgrader.php +++ b/wp-admin/includes/class-wp-upgrader.php @@ -194,7 +194,7 @@ class WP_Upgrader { $source = trailingslashit($source) . trailingslashit($source_files[0]); elseif ( count($source_files) == 0 ) return new WP_Error( 'incompatible_archive', $this->strings['incompatible_archive'], __( 'The plugin contains no files.' ) ); //There are no files? - else //Its only a single file, The upgrader will use the foldername of this file as the destination folder. foldername is based on zip filename. + else //It's only a single file, the upgrader will use the foldername of this file as the destination folder. foldername is based on zip filename. $source = trailingslashit($source); //Hook ability to change the source file location.. @@ -615,11 +615,11 @@ class Plugin_Upgrader extends WP_Upgrader { $plugins_dir = $wp_filesystem->wp_plugins_dir(); $this_plugin_dir = trailingslashit( dirname($plugins_dir . $plugin) ); - if ( ! $wp_filesystem->exists($this_plugin_dir) ) //If its already vanished. + if ( ! $wp_filesystem->exists($this_plugin_dir) ) //If it's already vanished. return $removed; // If plugin is in its own directory, recursively delete the directory. - if ( strpos($plugin, '/') && $this_plugin_dir != $plugins_dir ) //base check on if plugin includes directory separator AND that its not the root plugin folder + if ( strpos($plugin, '/') && $this_plugin_dir != $plugins_dir ) //base check on if plugin includes directory separator AND that it's not the root plugin folder $deleted = $wp_filesystem->delete($this_plugin_dir, true); else $deleted = $wp_filesystem->delete($plugins_dir . $plugin); @@ -1597,7 +1597,7 @@ class Theme_Upgrader_Skin extends WP_Upgrader_Skin { } /** - * Upgrade Skin helper for File uploads. This class handles the upload process and passes it as if its a local file to the Upgrade/Installer functions. + * Upgrade Skin helper for File uploads. This class handles the upload process and passes it as if it's a local file to the Upgrade/Installer functions. * * @TODO More Detailed docs, for methods as well. * @@ -1615,7 +1615,7 @@ class File_Upload_Upgrader { if ( empty($_FILES[$form]['name']) && empty($_GET[$urlholder]) ) wp_die(__('Please select a file')); - //Handle a newly uploaded file, Else assume its already been uploaded + //Handle a newly uploaded file, Else assume it's already been uploaded if ( ! empty($_FILES) ) { $overrides = array( 'test_form' => false, 'test_type' => false ); $file = wp_handle_upload( $_FILES[$form], $overrides ); diff --git a/wp-admin/includes/class-wp-users-list-table.php b/wp-admin/includes/class-wp-users-list-table.php index 9ad3c13aed..10802c110c 100644 --- a/wp-admin/includes/class-wp-users-list-table.php +++ b/wp-admin/includes/class-wp-users-list-table.php @@ -260,7 +260,7 @@ class WP_Users_List_Table extends WP_List_Table { $actions = apply_filters( 'user_row_actions', $actions, $user_object ); $edit .= $this->row_actions( $actions ); - // Set up the checkbox ( because the user is editable, otherwise its empty ) + // Set up the checkbox ( because the user is editable, otherwise it's empty ) $checkbox = '' . ""; diff --git a/wp-admin/includes/file.php b/wp-admin/includes/file.php index 942f347f59..05eaf82527 100644 --- a/wp-admin/includes/file.php +++ b/wp-admin/includes/file.php @@ -926,7 +926,7 @@ function request_filesystem_credentials($form_post, $type = '', $error = false, $credentials['connection_type'] = 'ftps'; else if ( !empty($_POST['connection_type']) ) $credentials['connection_type'] = stripslashes($_POST['connection_type']); - else if ( !isset($credentials['connection_type']) ) //All else fails (And its not defaulted to something else saved), Default to FTP + else if ( !isset($credentials['connection_type']) ) //All else fails (And it's not defaulted to something else saved), Default to FTP $credentials['connection_type'] = 'ftp'; if ( ! $error && diff --git a/wp-admin/includes/plugin.php b/wp-admin/includes/plugin.php index f305ef9bc6..109e66d8b7 100644 --- a/wp-admin/includes/plugin.php +++ b/wp-admin/includes/plugin.php @@ -728,7 +728,7 @@ function delete_plugins($plugins, $redirect = '' ) { $this_plugin_dir = trailingslashit( dirname($plugins_dir . $plugin_file) ); // If plugin is in its own directory, recursively delete the directory. - if ( strpos($plugin_file, '/') && $this_plugin_dir != $plugins_dir ) //base check on if plugin includes directory separator AND that its not the root plugin folder + if ( strpos($plugin_file, '/') && $this_plugin_dir != $plugins_dir ) //base check on if plugin includes directory separator AND that it's not the root plugin folder $deleted = $wp_filesystem->delete($this_plugin_dir, true); else $deleted = $wp_filesystem->delete($plugins_dir . $plugin_file); diff --git a/wp-content/themes/twentyeleven/inc/widgets.php b/wp-content/themes/twentyeleven/inc/widgets.php index b39fc729b3..c4c8ae0014 100644 --- a/wp-content/themes/twentyeleven/inc/widgets.php +++ b/wp-content/themes/twentyeleven/inc/widgets.php @@ -30,7 +30,7 @@ class Twenty_Eleven_Ephemera_Widget extends WP_Widget { * * @param array An array of standard parameters for widgets in this theme * @param array An array of settings for this widget instance - * @return void Echoes it's output + * @return void Echoes its output **/ function widget( $args, $instance ) { $cache = wp_cache_get( 'widget_twentyeleven_ephemera', 'widget' ); diff --git a/wp-includes/class-http.php b/wp-includes/class-http.php index b50909fd9f..75d835205e 100644 --- a/wp-includes/class-http.php +++ b/wp-includes/class-http.php @@ -134,7 +134,7 @@ class WP_Http { unset( $homeURL ); // If we are streaming to a file but no filename was given drop it in the WP temp dir - // and pick it's name using the basename of the $url + // and pick its name using the basename of the $url if ( $r['stream'] && empty( $r['filename'] ) ) $r['filename'] = get_temp_dir() . basename( $url ); @@ -530,7 +530,7 @@ class WP_Http { if ( !empty($wildcard_regex) ) return !preg_match($wildcard_regex, $check['host']); else - return !in_array( $check['host'], $accessible_hosts ); //Inverse logic, If its in the array, then we can't access it. + return !in_array( $check['host'], $accessible_hosts ); //Inverse logic, If it's in the array, then we can't access it. } @@ -555,7 +555,7 @@ class WP_Http { // Start off with the Absolute URL path $path = ! empty( $url_parts['path'] ) ? $url_parts['path'] : '/'; - // If the it's a root-relative path, then great + // If it's a root-relative path, then great if ( ! empty( $relative_url_parts['path'] ) && '/' == $relative_url_parts['path'][0] ) { $path = $relative_url_parts['path']; diff --git a/wp-includes/comment.php b/wp-includes/comment.php index 7a8f71cfd4..09bad3c9ce 100644 --- a/wp-includes/comment.php +++ b/wp-includes/comment.php @@ -1673,7 +1673,7 @@ function discover_pingback_server_uri( $url, $deprecated = '' ) { if ( preg_match('#(image|audio|video|model)/#is', wp_remote_retrieve_header( $response, 'content-type' )) ) return false; - // Now do a GET since we're going to look in the html headers (and we're sure its not a binary file) + // Now do a GET since we're going to look in the html headers (and we're sure it's not a binary file) $response = wp_remote_get( $url, array( 'timeout' => 2, 'httpversion' => '1.0' ) ); if ( is_wp_error( $response ) ) diff --git a/wp-includes/deprecated.php b/wp-includes/deprecated.php index c8fdf4ff2f..b2c9398b12 100644 --- a/wp-includes/deprecated.php +++ b/wp-includes/deprecated.php @@ -394,7 +394,7 @@ function user_can_edit_user($user_id, $other_user) { * @param string $cat_name Optional. The category name to use. If no match is found uses all. * @param string $before Optional. The html to output before the link. * @param string $after Optional. The html to output after the link. - * @param string $between Optional. The html to output between the link/image and it's description. Not used if no image or $show_images is true. + * @param string $between Optional. The html to output between the link/image and its description. Not used if no image or $show_images is true. * @param bool $show_images Optional. Whether to show images (if defined). * @param string $orderby Optional. The order to output the links. E.g. 'id', 'name', 'url', 'description' or 'rating'. Or maybe owner. * If you start the name with an underscore the order will be reversed. You can also specify 'rand' as the order which will return links in a @@ -547,7 +547,7 @@ function get_linkobjects($category = 0, $orderby = 'name', $limit = 0) { * @param string $cat_name The category name to use. If no match is found uses all * @param string $before The html to output before the link * @param string $after The html to output after the link - * @param string $between The html to output between the link/image and it's description. Not used if no image or show_images is true + * @param string $between The html to output between the link/image and its description. Not used if no image or show_images is true * @param bool $show_images Whether to show images (if defined). * @param string $orderby the order to output the links. E.g. 'id', 'name', 'url', * 'description', or 'rating'. Or maybe owner. If you start the name with an @@ -575,7 +575,7 @@ function get_linksbyname_withrating($cat_name = "noname", $before = '', $after = * @param int $category The category to use. If no category supplied uses all * @param string $before The html to output before the link * @param string $after The html to output after the link - * @param string $between The html to output between the link/image and it's description. Not used if no image or show_images == true + * @param string $between The html to output between the link/image and its description. Not used if no image or show_images == true * @param bool $show_images Whether to show images (if defined). * @param string $orderby The order to output the links. E.g. 'id', 'name', 'url', * 'description', or 'rating'. Or maybe owner. If you start the name with an diff --git a/wp-includes/feed-atom-comments.php b/wp-includes/feed-atom-comments.php index 174670379c..1a89c47955 100644 --- a/wp-includes/feed-atom-comments.php +++ b/wp-includes/feed-atom-comments.php @@ -75,7 +75,7 @@ if ( have_comments() ) : while ( have_comments() ) : the_comment(); comment_parent); - // The rel attribute below and the id tag above should be GUIDs, but WP doesn't create them for comments (unlike posts). Either way, its more important that they both use the same system + // The rel attribute below and the id tag above should be GUIDs, but WP doesn't create them for comments (unlike posts). Either way, it's more important that they both use the same system ?> posts.post_date)='" . $q['day'] . "'"; - // If we've got a post_type AND its not "any" post_type. + // If we've got a post_type AND it's not "any" post_type. if ( !empty($q['post_type']) && 'any' != $q['post_type'] ) { foreach ( (array)$q['post_type'] as $_post_type ) { $ptype_obj = get_post_type_object($_post_type); diff --git a/wp-includes/rss.php b/wp-includes/rss.php index 0d94937685..4797d4c4a7 100644 --- a/wp-includes/rss.php +++ b/wp-includes/rss.php @@ -422,7 +422,7 @@ function fetch_rss ($url) { else { // Flow // 1. check cache - // 2. if there is a hit, make sure its fresh + // 2. if there is a hit, make sure it's fresh // 3. if cached obj fails freshness check, fetch remote // 4. if remote fails, return stale object, or error diff --git a/wp-includes/theme.php b/wp-includes/theme.php index d8c2419773..580d2046ed 100644 --- a/wp-includes/theme.php +++ b/wp-includes/theme.php @@ -631,7 +631,7 @@ function preview_theme_ob_filter( $content ) { */ function preview_theme_ob_filter_callback( $matches ) { if ( strpos($matches[4], 'onclick') !== false ) - $matches[4] = preg_replace('#onclick=([\'"]).*?(?. (?. (?