From 13c25f5f4971700e96ef7c26243a99aaa1f3bad3 Mon Sep 17 00:00:00 2001 From: Drew Jaynes Date: Wed, 16 Sep 2015 12:46:28 +0000 Subject: [PATCH] Docs: Put "it's" in its place (again). Props kitchin. Fixes #33894. Built from https://develop.svn.wordpress.org/trunk@34234 git-svn-id: http://core.svn.wordpress.org/trunk@34198 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/file.php | 2 +- wp-admin/includes/image-edit.php | 4 ++-- wp-includes/class-json.php | 2 +- wp-includes/class-pop3.php | 2 +- wp-includes/class-wp-http-streams.php | 4 ++-- wp-includes/version.php | 2 +- wp-includes/wp-db.php | 12 ++++++++---- 7 files changed, 16 insertions(+), 12 deletions(-) diff --git a/wp-admin/includes/file.php b/wp-admin/includes/file.php index c54135a7b6..c453765213 100644 --- a/wp-admin/includes/file.php +++ b/wp-admin/includes/file.php @@ -154,7 +154,7 @@ function wp_tempnam( $filename = '', $dir = '' ) { $temp_filename = basename( $filename ); $temp_filename = preg_replace( '|\.[^.]*$|', '', $temp_filename ); - // If the folder is falsey, use it's parent directory name instead + // If the folder is falsey, use its parent directory name instead. if ( ! $temp_filename ) { return wp_tempnam( dirname( $filename ), $dir ); } diff --git a/wp-admin/includes/image-edit.php b/wp-admin/includes/image-edit.php index c15562f310..e1f9f7ef8c 100644 --- a/wp-admin/includes/image-edit.php +++ b/wp-admin/includes/image-edit.php @@ -614,7 +614,7 @@ function wp_restore_image($post_id) { if ( $parts['basename'] != $data['file'] ) { if ( defined('IMAGE_EDIT_OVERWRITE') && IMAGE_EDIT_OVERWRITE ) { - // Delete only if it's edited image. + // Delete only if it's an edited image. if ( preg_match('/-e[0-9]{13}\./', $parts['basename']) ) { wp_delete_file( $file ); } @@ -637,7 +637,7 @@ function wp_restore_image($post_id) { if ( isset($meta['sizes'][$default_size]) && $meta['sizes'][$default_size]['file'] != $data['file'] ) { if ( defined('IMAGE_EDIT_OVERWRITE') && IMAGE_EDIT_OVERWRITE ) { - // Delete only if it's edited image + // Delete only if it's an edited image. if ( preg_match('/-e[0-9]{13}-/', $meta['sizes'][$default_size]['file']) ) { $delete_file = path_join( $parts['dirname'], $meta['sizes'][$default_size]['file'] ); wp_delete_file( $delete_file ); diff --git a/wp-includes/class-json.php b/wp-includes/class-json.php index 1861b5230e..53b31e3634 100644 --- a/wp-includes/class-json.php +++ b/wp-includes/class-json.php @@ -136,7 +136,7 @@ class Services_JSON * from encode() should be checked with isError() * - SERVICES_JSON_USE_TO_JSON: call toJSON when serializing objects * It serializes the return value from the toJSON call rather - * than the object it'self, toJSON can return associative arrays, + * than the object itself, toJSON can return associative arrays, * strings or numbers, if you return an object, make sure it does * not have a toJSON method, otherwise an error will occur. */ diff --git a/wp-includes/class-pop3.php b/wp-includes/class-pop3.php index 7d641bf073..ffbc377daf 100644 --- a/wp-includes/class-pop3.php +++ b/wp-includes/class-pop3.php @@ -82,7 +82,7 @@ class POP3 { // Opens a socket to the specified server. Unless overridden, // port defaults to 110. Returns true on success, false on fail - // If MAILSERVER is set, override $server with it's value + // If MAILSERVER is set, override $server with its value. if (!isset($port) || !$port) {$port = 110;} if(!empty($this->MAILSERVER)) diff --git a/wp-includes/class-wp-http-streams.php b/wp-includes/class-wp-http-streams.php index 8c12fce81c..4f5067e576 100644 --- a/wp-includes/class-wp-http-streams.php +++ b/wp-includes/class-wp-http-streams.php @@ -313,7 +313,7 @@ class WP_Http_Streams { } /** - * Verifies the received SSL certificate against it's Common Names and subjectAltName fields + * Verifies the received SSL certificate against its Common Names and subjectAltName fields. * * PHP's SSL verifications only verify that it's a valid Certificate, it doesn't verify if * the certificate is valid for the hostname which was requested. @@ -415,7 +415,7 @@ class WP_Http_Streams { * Deprecated HTTP Transport method which used fsockopen. * * This class is not used, and is included for backwards compatibility only. - * All code should make use of WP_HTTP directly through it's API. + * All code should make use of WP_Http directly through its API. * * @see WP_HTTP::request * diff --git a/wp-includes/version.php b/wp-includes/version.php index cdb8c052d0..8a451624ff 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.4-alpha-34233'; +$wp_version = '4.4-alpha-34234'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. diff --git a/wp-includes/wp-db.php b/wp-includes/wp-db.php index efd66f7f2f..a0c59cfc35 100644 --- a/wp-includes/wp-db.php +++ b/wp-includes/wp-db.php @@ -2049,8 +2049,10 @@ class wpdb { protected function process_field_charsets( $data, $table ) { foreach ( $data as $field => $value ) { if ( '%d' === $value['format'] || '%f' === $value['format'] ) { - // We can skip this field if we know it isn't a string. - // This checks %d/%f versus ! %s because it's sprintf() could take more. + /* + * We can skip this field if we know it isn't a string. + * This checks %d/%f versus ! %s because its sprintf() could take more. + */ $value['charset'] = false; } else { $value['charset'] = $this->get_col_charset( $table, $field ); @@ -2079,8 +2081,10 @@ class wpdb { protected function process_field_lengths( $data, $table ) { foreach ( $data as $field => $value ) { if ( '%d' === $value['format'] || '%f' === $value['format'] ) { - // We can skip this field if we know it isn't a string. - // This checks %d/%f versus ! %s because it's sprintf() could take more. + /* + * We can skip this field if we know it isn't a string. + * This checks %d/%f versus ! %s because its sprintf() could take more. + */ $value['length'] = false; } else { $value['length'] = $this->get_col_length( $table, $field );