Changeset 34234
- Timestamp:
- 09/16/2015 12:45:51 PM (9 years ago)
- Location:
- trunk
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/wp-admin/includes/file.php
r33908 r34234 155 155 $temp_filename = preg_replace( '|\.[^.]*$|', '', $temp_filename ); 156 156 157 // If the folder is falsey, use it 's parent directory name instead157 // If the folder is falsey, use its parent directory name instead. 158 158 if ( ! $temp_filename ) { 159 159 return wp_tempnam( dirname( $filename ), $dir ); -
trunk/src/wp-admin/includes/image-edit.php
r32964 r34234 615 615 if ( defined('IMAGE_EDIT_OVERWRITE') && IMAGE_EDIT_OVERWRITE ) { 616 616 617 // Delete only if it's edited image.617 // Delete only if it's an edited image. 618 618 if ( preg_match('/-e[0-9]{13}\./', $parts['basename']) ) { 619 619 wp_delete_file( $file ); … … 638 638 if ( defined('IMAGE_EDIT_OVERWRITE') && IMAGE_EDIT_OVERWRITE ) { 639 639 640 // Delete only if it's edited image640 // Delete only if it's an edited image. 641 641 if ( preg_match('/-e[0-9]{13}-/', $meta['sizes'][$default_size]['file']) ) { 642 642 $delete_file = path_join( $parts['dirname'], $meta['sizes'][$default_size]['file'] ); -
trunk/src/wp-includes/class-json.php
r32990 r34234 137 137 * - SERVICES_JSON_USE_TO_JSON: call toJSON when serializing objects 138 138 * It serializes the return value from the toJSON call rather 139 * than the object it 'self,toJSON can return associative arrays,139 * than the object itself, toJSON can return associative arrays, 140 140 * strings or numbers, if you return an object, make sure it does 141 141 * not have a toJSON method, otherwise an error will occur. -
trunk/src/wp-includes/class-pop3.php
r32990 r34234 83 83 // port defaults to 110. Returns true on success, false on fail 84 84 85 // If MAILSERVER is set, override $server with it 's value85 // If MAILSERVER is set, override $server with its value. 86 86 87 87 if (!isset($port) || !$port) {$port = 110;} -
trunk/src/wp-includes/class-wp-http-streams.php
r34123 r34234 314 314 315 315 /** 316 * Verifies the received SSL certificate against it 's Common Names and subjectAltName fields316 * Verifies the received SSL certificate against its Common Names and subjectAltName fields. 317 317 * 318 318 * PHP's SSL verifications only verify that it's a valid Certificate, it doesn't verify if … … 416 416 * 417 417 * This class is not used, and is included for backwards compatibility only. 418 * All code should make use of WP_H TTP directly through it's API.418 * All code should make use of WP_Http directly through its API. 419 419 * 420 420 * @see WP_HTTP::request -
trunk/src/wp-includes/wp-db.php
r33956 r34234 2050 2050 foreach ( $data as $field => $value ) { 2051 2051 if ( '%d' === $value['format'] || '%f' === $value['format'] ) { 2052 // We can skip this field if we know it isn't a string. 2053 // This checks %d/%f versus ! %s because it's sprintf() could take more. 2052 /* 2053 * We can skip this field if we know it isn't a string. 2054 * This checks %d/%f versus ! %s because its sprintf() could take more. 2055 */ 2054 2056 $value['charset'] = false; 2055 2057 } else { … … 2080 2082 foreach ( $data as $field => $value ) { 2081 2083 if ( '%d' === $value['format'] || '%f' === $value['format'] ) { 2082 // We can skip this field if we know it isn't a string. 2083 // This checks %d/%f versus ! %s because it's sprintf() could take more. 2084 /* 2085 * We can skip this field if we know it isn't a string. 2086 * This checks %d/%f versus ! %s because its sprintf() could take more. 2087 */ 2084 2088 $value['length'] = false; 2085 2089 } else { -
trunk/tests/phpunit/tests/canonical.php
r32918 r34234 53 53 */ 54 54 55 // Please Note: A few test cases are commented out below, Look at the test case following it, in most cases it's simpl eshowing 2 options for the "proper" redirect.55 // Please Note: A few test cases are commented out below, Look at the test case following it, in most cases it's simply showing 2 options for the "proper" redirect. 56 56 return array( 57 57 // Categories -
trunk/tests/phpunit/tests/mail.php
r33124 r34234 13 13 * Send a mail with a 1000 char long line. 14 14 * 15 * `PHPMailer::createBody()` will set `$this->Encoding = 'quoted-printable'` (away from it 's default of 8bit)15 * `PHPMailer::createBody()` will set `$this->Encoding = 'quoted-printable'` (away from its default of 8bit) 16 16 * when it encounters a line longer than 999 characters. But PHPMailer doesn't clean up after itself / presets 17 17 * all variables, which means that following tests would fail. To solve this issue we set `$this->Encoding`
Note: See TracChangeset
for help on using the changeset viewer.