WordPress.org

Make WordPress Core

Changeset 31099


Ignore:
Timestamp:
01/08/2015 09:11:46 PM (7 years ago)
Author:
wonderboymusic
Message:

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

See #30799.

Location:
trunk/src
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/wp-admin/includes/image.php

    r30458 r31099  
    321321                $meta['credit'] = trim( $iptc['2#080'][0] );
    322322
    323             if ( ! empty( $iptc['2#055'][0] ) and ! empty( $iptc['2#060'][0] ) ) // created date and time
     323            if ( ! empty( $iptc['2#055'][0] ) && ! empty( $iptc['2#060'][0] ) ) // created date and time
    324324                $meta['created_timestamp'] = strtotime( $iptc['2#055'][0] . ' ' . $iptc['2#060'][0] );
    325325
  • trunk/src/wp-includes/media.php

    r31090 r31099  
    360360 */
    361361function wp_constrain_dimensions( $current_width, $current_height, $max_width=0, $max_height=0 ) {
    362     if ( !$max_width and !$max_height )
     362    if ( !$max_width && !$max_height )
    363363        return array( $current_width, $current_height );
    364364
  • trunk/src/wp-includes/shortcodes.php

    r30545 r31099  
    312312            elseif (!empty($m[5]))
    313313                $atts[strtolower($m[5])] = stripcslashes($m[6]);
    314             elseif (isset($m[7]) and strlen($m[7]))
     314            elseif (isset($m[7]) && strlen($m[7]))
    315315                $atts[] = stripcslashes($m[7]);
    316316            elseif (isset($m[8]))
Note: See TracChangeset for help on using the changeset viewer.