Changeset 31099

Timestamp:

01/08/2015 09:11:46 PM (10 years ago)

Author:

wonderboymusic

Message:

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

See #30799.

Location:

trunk/src

Files:

• wp-admin/includes/image.php (modified) (1 diff)
• wp-includes/media.php (modified) (1 diff)
• wp-includes/shortcodes.php (modified) (1 diff)

trunk/src/wp-admin/includes/image.php

@@ -321 +321 @@
                 $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] );
 

trunk/src/wp-includes/media.php

@@ -360 +360 @@
  */
 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 );
 

trunk/src/wp-includes/shortcodes.php

@@ -312 +312 @@
             elseif (!empty($m[5]))
                 $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]);
             elseif (isset($m[8]))