Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2025-01-03 15:08:10 +01:00
Code Issues Projects Releases Wiki Activity

Docs: Put "it's" in its place (again).

Browse Source 
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
This commit is contained in:
Drew Jaynes 2015-09-16 12:46:28 +00:00
parent 53ac914bd5
commit 13c25f5f49
7 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-admin/includes/file.php
View File

@ -154,7 +154,7 @@ function wp_tempnam( $filename = '', $dir = '' ) {
$temp_filename = basename( $filename ); $temp_filename = basename( $filename );
$temp_filename = preg_replace( '|\.[^.]*$|', '', $temp_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 ) { if ( ! $temp_filename ) {
return wp_tempnam( dirname( $filename ), $dir ); return wp_tempnam( dirname( $filename ), $dir );
} }

4
wp-admin/includes/image-edit.php
View File

@ -614,7 +614,7 @@ function wp_restore_image($post_id) {
if ( $parts['basename'] != $data['file'] ) { if ( $parts['basename'] != $data['file'] ) {
if ( defined('IMAGE_EDIT_OVERWRITE') && IMAGE_EDIT_OVERWRITE ) { 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']) ) { if ( preg_match('/-e[0-9]{13}\./', $parts['basename']) ) {
wp_delete_file( $file ); 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 ( isset($meta['sizes'][$default_size]) && $meta['sizes'][$default_size]['file'] != $data['file'] ) {
if ( defined('IMAGE_EDIT_OVERWRITE') && IMAGE_EDIT_OVERWRITE ) { 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']) ) { if ( preg_match('/-e[0-9]{13}-/', $meta['sizes'][$default_size]['file']) ) {
$delete_file = path_join( $parts['dirname'], $meta['sizes'][$default_size]['file'] ); $delete_file = path_join( $parts['dirname'], $meta['sizes'][$default_size]['file'] );
wp_delete_file( $delete_file ); wp_delete_file( $delete_file );

2
wp-includes/class-json.php
View File

@ -136,7 +136,7 @@ class Services_JSON
* from encode() should be checked with isError() * from encode() should be checked with isError()
* - SERVICES_JSON_USE_TO_JSON: call toJSON when serializing objects * - SERVICES_JSON_USE_TO_JSON: call toJSON when serializing objects
* It serializes the return value from the toJSON call rather * 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 * strings or numbers, if you return an object, make sure it does
* not have a toJSON method, otherwise an error will occur. * not have a toJSON method, otherwise an error will occur.
*/ */

2
wp-includes/class-pop3.php
View File

@ -82,7 +82,7 @@ class POP3 {
// Opens a socket to the specified server. Unless overridden, // Opens a socket to the specified server. Unless overridden,
// port defaults to 110. Returns true on success, false on fail // 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 (!isset($port) || !$port) {$port = 110;}
if(!empty($this->MAILSERVER)) if(!empty($this->MAILSERVER))

4
wp-includes/class-wp-http-streams.php
View File

@ -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 * 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. * 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. * Deprecated HTTP Transport method which used fsockopen.
* *
* This class is not used, and is included for backwards compatibility only. * 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 * @see WP_HTTP::request
* *

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @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. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.

12
wp-includes/wp-db.php
View File

@ -2049,8 +2049,10 @@ class wpdb {
protected function process_field_charsets( $data, $table ) { protected function process_field_charsets( $data, $table ) {
foreach ( $data as $field => $value ) { foreach ( $data as $field => $value ) {
if ( '%d' === $value['format'] || '%f' === $value['format'] ) { 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; $value['charset'] = false;
} else { } else {
$value['charset'] = $this->get_col_charset( $table, $field ); $value['charset'] = $this->get_col_charset( $table, $field );
@ -2079,8 +2081,10 @@ class wpdb {
protected function process_field_lengths( $data, $table ) { protected function process_field_lengths( $data, $table ) {
foreach ( $data as $field => $value ) { foreach ( $data as $field => $value ) {
if ( '%d' === $value['format'] || '%f' === $value['format'] ) { 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; $value['length'] = false;
} else { } else {
$value['length'] = $this->get_col_length( $table, $field ); $value['length'] = $this->get_col_length( $table, $field );