WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use `&&` instead of `and` in the 3 places where `and` was used. 

See #30799.

Built from https://develop.svn.wordpress.org/trunk@31099


git-svn-id: http://core.svn.wordpress.org/trunk@31080 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Scott Taylor 2015-01-08 21:12:22 +00:00
parent dfac056cf1
commit 4feecb922c
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -320,7 +320,7 @@ function wp_read_image_metadata( $file ) {
elseif ( ! empty( $iptc['2#080'][0] ) ) // creator / legacy byline elseif ( ! empty( $iptc['2#080'][0] ) ) // creator / legacy byline
$meta['credit'] = trim( $iptc['2#080'][0] ); $meta['credit'] = trim( $iptc['2#080'][0] );
if ( ! empty( $iptc['2#055'][0] ) and ! empty( $iptc['2#060'][0] ) ) // created date and time if ( ! empty( $iptc['2#055'][0] ) && ! empty( $iptc['2#060'][0] ) ) // created date and time
$meta['created_timestamp'] = strtotime( $iptc['2#055'][0] . ' ' . $iptc['2#060'][0] ); $meta['created_timestamp'] = strtotime( $iptc['2#055'][0] . ' ' . $iptc['2#060'][0] );
if ( ! empty( $iptc['2#116'][0] ) ) // copyright if ( ! empty( $iptc['2#116'][0] ) ) // copyright

2
wp-includes/media.php
View File

@ -359,7 +359,7 @@ function get_image_tag($id, $alt, $title, $align, $size='medium') {
* @return array First item is the width, the second item is the height. * @return array First item is the width, the second item is the height.
*/ */
function wp_constrain_dimensions( $current_width, $current_height, $max_width=0, $max_height=0 ) { function wp_constrain_dimensions( $current_width, $current_height, $max_width=0, $max_height=0 ) {
if ( !$max_width and !$max_height ) if ( !$max_width && !$max_height )
return array( $current_width, $current_height ); return array( $current_width, $current_height );
$width_ratio = $height_ratio = 1.0; $width_ratio = $height_ratio = 1.0;

2
wp-includes/shortcodes.php
View File

@ -311,7 +311,7 @@ function shortcode_parse_atts($text) {
$atts[strtolower($m[3])] = stripcslashes($m[4]); $atts[strtolower($m[3])] = stripcslashes($m[4]);
elseif (!empty($m[5])) elseif (!empty($m[5]))
$atts[strtolower($m[5])] = stripcslashes($m[6]); $atts[strtolower($m[5])] = stripcslashes($m[6]);
elseif (isset($m[7]) and strlen($m[7])) elseif (isset($m[7]) && strlen($m[7]))
$atts[] = stripcslashes($m[7]); $atts[] = stripcslashes($m[7]);
elseif (isset($m[8])) elseif (isset($m[8]))
$atts[] = stripcslashes($m[8]); $atts[] = stripcslashes($m[8]);

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.2-alpha-31098'; $wp_version = '4.2-alpha-31099';
/** /**
* 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.