enmi-conf.org: comparison wp/wp-admin/includes/image.php

equal deleted inserted replaced

-:be944660c56a
+:3d72ae0968f4
 	$result = $editor->save( $dst_file );
 	if ( is_wp_error( $result ) ) {
 		return $result;
 	}
+	if ( ! empty( $result['path'] ) ) {
+		return $result['path'];
+	}
 	return $dst_file;
 }
 /**
 * Compare the existing image sub-sizes (as saved in the attachment meta)
 * Registered sub-sizes that are larger than the image are skipped.
 *
 * @since 5.3.0
 *
 * @param int $attachment_id The image attachment post ID.
-* @return array An array of the image sub-sizes that are currently defined but don't exist for this image.
+* @return array[] Associative array of arrays of image sub-size information for
+*                 missing image sizes, keyed by image size name.
 */
 function wp_get_missing_image_subsizes( $attachment_id ) {
 	if ( ! wp_attachment_is_image( $attachment_id ) ) {
 		return array();
 	}
 	/**
 	 * Filters the array of missing image sub-sizes for an uploaded image.
 	 *
 	 * @since 5.3.0
 	 *
-	 * @param array $missing_sizes Array with the missing image sub-sizes.
+	 * @param array[] $missing_sizes Associative array of arrays of image sub-size information for
-	 * @param array $image_meta    The image meta data.
+	 *                               missing image sizes, keyed by image size name.
-	 * @param int   $attachment_id The image attachment post ID.
+	 * @param array   $image_meta    The image meta data.
+	 * @param int     $attachment_id The image attachment post ID.
 	 */
 	return apply_filters( 'wp_get_missing_image_subsizes', $missing_sizes, $image_meta, $attachment_id );
 }
 /**
 	$image_meta['file'] = _wp_relative_upload_path( $new_file );
 	// Store the original image file name in image_meta.
 	$image_meta['original_image'] = wp_basename( $original_file );
+	// Add image file size.
+	$image_meta['filesize'] = wp_filesize( $new_file );
 	return $image_meta;
 }
 /**
 * Creates image sub-sizes, adds the new data to the image meta `sizes` array, and updates the image metadata.
 * sub-size is created. If there was an error, it is added to the returned image metadata array.
 *
 * @since 5.3.0
 *
 * @param string $file          Full path to the image file.
-* @param int    $attachment_id Attachment Id to process.
+* @param int    $attachment_id Attachment ID to process.
 * @return array The image attachment meta data.
 */
 function wp_create_image_subsizes( $file, $attachment_id ) {
 	$imagesize = wp_getimagesize( $file );
 		return array();
 	}
 	// Default image meta.
 	$image_meta = array(
-		'width'  => $imagesize[0],
+		'width'    => $imagesize[0],
-		'height' => $imagesize[1],
+		'height'   => $imagesize[1],
-		'file'   => _wp_relative_upload_path( $file ),
+		'file'     => _wp_relative_upload_path( $file ),
-		'sizes'  => array(),
+		'filesize' => wp_filesize( $file ),
+		'sizes'    => array(),
 	);
 	// Fetch additional metadata from EXIF/IPTC.
 	$exif_meta = wp_read_image_metadata( $file );
 * @access private
 *
 * @param array  $new_sizes     Array defining what sizes to create.
 * @param string $file          Full path to the image file.
 * @param array  $image_meta    The attachment meta data array.
-* @param int    $attachment_id Attachment Id to process.
+* @param int    $attachment_id Attachment ID to process.
 * @return array The attachment meta data with updated `sizes` array. Includes an array of errors encountered while resizing.
 */
 function _wp_make_subsizes( $new_sizes, $file, $image_meta, $attachment_id ) {
 	if ( empty( $image_meta ) || ! is_array( $image_meta ) ) {
 		// Not an image attachment.
 /**
 * Generate attachment meta data and create image sub-sizes for images.
 *
 * @since 2.1.0
 *
-* @param int    $attachment_id Attachment Id to process.
+* @param int    $attachment_id Attachment ID to process.
-* @param string $file          Filepath of the Attached image.
+* @param string $file          Filepath of the attached image.
 * @return array Metadata for attachment.
 */
 function wp_generate_attachment_metadata( $attachment_id, $file ) {
 	$attachment = get_post( $attachment_id );
 	}
 	// Remove the blob of binary data from the array.
 	unset( $metadata['image']['data'] );
+	// Capture file size for cases where it has not been captured yet, such as PDFs.
+	if ( ! isset( $metadata['filesize'] ) && file_exists( $file ) ) {
+		$metadata['filesize'] = wp_filesize( $file );
+	}
 	/**
 	 * Filters the generated attachment meta data.
 	 *
 	 * @since 2.1.0
 	 * @since 5.3.0 The `$context` parameter was added.
 /**
 * Convert a fraction string to a decimal.
 *
 * @since 2.5.0
 *
-* @param string $str
+* @param string $str Fraction string.
-* @return int|float
+* @return int|float Returns calculated fraction or integer 0 on invalid input.
 */
 function wp_exif_frac2dec( $str ) {
-	if ( false === strpos( $str, '/' ) ) {
+	if ( ! is_scalar( $str ) || is_bool( $str ) ) {
-		return $str;
+		return 0;
+	}
+	if ( ! is_string( $str ) ) {
+		return $str; // This can only be an integer or float, so this is fine.
+	}
+	// Fractions passed as a string must contain a single `/`.
+	if ( substr_count( $str, '/' ) !== 1 ) {
+		if ( is_numeric( $str ) ) {
+			return (float) $str;
+		}
+		return 0;
 	}
 	list( $numerator, $denominator ) = explode( '/', $str );
-	if ( ! empty( $denominator ) ) {
-		return $numerator / $denominator;
+	// Both the numerator and the denominator must be numbers.
-	}
+	if ( ! is_numeric( $numerator ) || ! is_numeric( $denominator ) ) {
-	return $str;
+		return 0;
+	}
+	// The denominator must not be zero.
+	if ( 0 == $denominator ) { // phpcs:ignore WordPress.PHP.StrictComparisons.LooseComparison -- Deliberate loose comparison.
+		return 0;
+	}
+	return $numerator / $denominator;
 }
 /**
 * Convert the exif date format to a unix timestamp.
 *
 * @since 2.5.0
 *
-* @param string $str
+* @param string $str A date string expected to be in Exif format (Y:m:d H:i:s).
-* @return int
+* @return int|false The unix timestamp, or false on failure.
 */
 function wp_exif_date2ts( $str ) {
 	list( $date, $time ) = explode( ' ', trim( $str ) );
 	list( $y, $m, $d )   = explode( ':', $date );
 			} else {
 				// phpcs:ignore WordPress.PHP.NoSilencedErrors -- Silencing notice and warning is intentional. See https://core.trac.wordpress.org/ticket/42480
 				$iptc = @iptcparse( $info['APP13'] );
 			}
+			if ( ! is_array( $iptc ) ) {
+				$iptc = array();
+			}
 			// Headline, "A brief synopsis of the caption".
 			if ( ! empty( $iptc['2#105'][0] ) ) {
 				$meta['title'] = trim( $iptc['2#105'][0] );
 				/*
 				* Title, "Many use the Title field to store the filename of the image,
 	/**
 	 * Filters the image types to check for exif data.
 	 *
 	 * @since 2.5.0
 	 *
-	 * @param array $image_types Image types to check for exif data.
+	 * @param int[] $image_types Array of image types to check for exif data. Each value
+	 *                           is usually one of the `IMAGETYPE_*` constants.
 	 */
 	$exif_image_types = apply_filters( 'wp_read_image_metadata_types', array( IMAGETYPE_JPEG, IMAGETYPE_TIFF_II, IMAGETYPE_TIFF_MM ) );
 	if ( is_callable( 'exif_read_data' ) && in_array( $image_type, $exif_image_types, true ) ) {
 		// Don't silence errors when in debug mode, unless running unit tests.
 		} else {
 			// phpcs:ignore WordPress.PHP.NoSilencedErrors -- Silencing notice and warning is intentional. See https://core.trac.wordpress.org/ticket/42480
 			$exif = @exif_read_data( $file );
 		}
+		if ( ! is_array( $exif ) ) {
+			$exif = array();
+		}
 		if ( ! empty( $exif['ImageDescription'] ) ) {
 			mbstring_binary_safe_encoding();
 			$description_length = strlen( $exif['ImageDescription'] );
 			reset_mbstring_encoding();
 		}
 		if ( empty( $meta['copyright'] ) && ! empty( $exif['Copyright'] ) ) {
 			$meta['copyright'] = trim( $exif['Copyright'] );
 		}
-		if ( ! empty( $exif['FNumber'] ) ) {
+		if ( ! empty( $exif['FNumber'] ) && is_scalar( $exif['FNumber'] ) ) {
 			$meta['aperture'] = round( wp_exif_frac2dec( $exif['FNumber'] ), 2 );
 		}
 		if ( ! empty( $exif['Model'] ) ) {
 			$meta['camera'] = trim( $exif['Model'] );
 		}
 		if ( empty( $meta['created_timestamp'] ) && ! empty( $exif['DateTimeDigitized'] ) ) {
 			$meta['created_timestamp'] = wp_exif_date2ts( $exif['DateTimeDigitized'] );
 		}
 		if ( ! empty( $exif['FocalLength'] ) ) {
-			$meta['focal_length'] = (string) wp_exif_frac2dec( $exif['FocalLength'] );
+			$meta['focal_length'] = (string) $exif['FocalLength'];
+			if ( is_scalar( $exif['FocalLength'] ) ) {
+				$meta['focal_length'] = (string) wp_exif_frac2dec( $exif['FocalLength'] );
+			}
 		}
 		if ( ! empty( $exif['ISOSpeedRatings'] ) ) {
 			$meta['iso'] = is_array( $exif['ISOSpeedRatings'] ) ? reset( $exif['ISOSpeedRatings'] ) : $exif['ISOSpeedRatings'];
 			$meta['iso'] = trim( $meta['iso'] );
 		}
 		if ( ! empty( $exif['ExposureTime'] ) ) {
-			$meta['shutter_speed'] = (string) wp_exif_frac2dec( $exif['ExposureTime'] );
+			$meta['shutter_speed'] = (string) $exif['ExposureTime'];
+			if ( is_scalar( $exif['ExposureTime'] ) ) {
+				$meta['shutter_speed'] = (string) wp_exif_frac2dec( $exif['ExposureTime'] );
+			}
 		}
 		if ( ! empty( $exif['Orientation'] ) ) {
 			$meta['orientation'] = $exif['Orientation'];
 		}
 	}
 *
 * @param string $path File path to test.
 * @return bool True if suitable, false if not suitable.
 */
 function file_is_displayable_image( $path ) {
-	$displayable_image_types = array( IMAGETYPE_GIF, IMAGETYPE_JPEG, IMAGETYPE_PNG, IMAGETYPE_BMP, IMAGETYPE_ICO, IMAGETYPE_WEBP ); // phpcs:ignore PHPCompatibility.Constants.NewConstants.imagetype_webpFound
+	$displayable_image_types = array( IMAGETYPE_GIF, IMAGETYPE_JPEG, IMAGETYPE_PNG, IMAGETYPE_BMP, IMAGETYPE_ICO, IMAGETYPE_WEBP );
 	$info = wp_getimagesize( $path );
 	if ( empty( $info ) ) {
 		$result = false;
 	} elseif ( ! in_array( $info[2], $displayable_image_types, true ) ) {

changeset 19	3d72ae0968f4
parent 18	be944660c56a
child 21	48c4eec2b7e6