auto-patch 638-dev-dev01-2024-05-14T20_44_36

This commit is contained in:
root
2024-05-14 20:44:36 +00:00
parent a941559057
commit 5dbb0b284e
1812 changed files with 29671 additions and 14588 deletions

View File

@@ -581,11 +581,21 @@ abstract class AbstractProcess implements ProcessInterface {
// This file type is not supported.
$extension = $file->get_extension();
if ( '' === $extension ) {
if ( ! $extension ) {
$response = new WP_Error(
'extension_not_mime',
__( 'This file has an extension that does not match a mime type.', 'imagify' )
);
} elseif ( '' === $extension ) {
$response = new WP_Error(
'no_extension',
__( 'With no extension, this file cannot be optimized.', 'imagify' )
);
} elseif ( ! $extension ) {
$response = new WP_Error(
'extension_not_mime',
__( 'This file has an extension that does not match a mime type.', 'imagify' )
);
} else {
$response = new WP_Error(
'extension_not_supported',
@@ -1532,7 +1542,9 @@ abstract class AbstractProcess implements ProcessInterface {
* @return string Current format we are targeting.
*/
public function get_current_format() {
return $this->get_option( 'convert_to_avif' ) ? static::AVIF_SUFFIX : static::WEBP_SUFFIX;
$format = get_imagify_option( 'optimization_format' );
return ( 'avif' === $format ) ? static::AVIF_SUFFIX : static::WEBP_SUFFIX;
}
/**
@@ -1551,7 +1563,7 @@ abstract class AbstractProcess implements ProcessInterface {
foreach ( $formats as $format ) {
$suffix = preg_quote( $this->get_suffix_from_format( $format ), '/' );
if ( preg_match( '/^(?<size>.+)' . $suffix . '$/', $size_name, $matches ) ) {
if ( preg_match( '/^(?<size>.+)' . $suffix . '$/', (string) $size_name, $matches ) ) {
return $matches['size'];
}
}