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

Coding Standards: Use consistent formatting for error messages in `WP_Image_Editor_Imagick::write_image()` and `::strip_meta()`. 

See #50767.
Built from https://develop.svn.wordpress.org/trunk@49546


git-svn-id: http://core.svn.wordpress.org/trunk@49284 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2020-11-09 15:35:05 +00:00
parent 3e3328a269
commit 5b62b44c15
2 changed files with 29 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
wp-includes/class-wp-image-editor-imagick.php
View File

@ -735,22 +735,28 @@ class WP_Image_Editor_Imagick extends WP_Image_Editor {
* Checks for exact type due to: https://www.php.net/manual/en/function.file-put-contents.php * Checks for exact type due to: https://www.php.net/manual/en/function.file-put-contents.php
*/ */
if ( file_put_contents( $filename, $image->getImageBlob() ) === false ) { if ( file_put_contents( $filename, $image->getImageBlob() ) === false ) {
return new WP_Error(
'image_save_error',
sprintf(
/* translators: %s: PHP function name. */ /* translators: %s: PHP function name. */
return new WP_Error( 'image_save_error', sprintf( __( '%s failed while writing image to stream.' ), '<code>file_put_contents()</code>' ), $filename ); __( '%s failed while writing image to stream.' ),
'<code>file_put_contents()</code>'
),
$filename
);
} else { } else {
return true; return true;
} }
} else { } else {
$dir_name = dirname( $filename ); $dirname = dirname( $filename );
$dir_exists = wp_mkdir_p( $dir_name );
if ( ! $dir_exists ) { if ( ! wp_mkdir_p( $dirname ) ) {
return new WP_Error( return new WP_Error(
'image_save_error', 'image_save_error',
sprintf( sprintf(
/* translators: %s: Directory path. */ /* translators: %s: Directory path. */
__( 'Unable to create directory %s. Is its parent directory writable by the server?' ), __( 'Unable to create directory %s. Is its parent directory writable by the server?' ),
esc_html( $dir_name ) esc_html( $dirname )
) )
); );
} }
@ -801,13 +807,25 @@ class WP_Image_Editor_Imagick extends WP_Image_Editor {
protected function strip_meta() { protected function strip_meta() {
if ( ! is_callable( array( $this->image, 'getImageProfiles' ) ) ) { if ( ! is_callable( array( $this->image, 'getImageProfiles' ) ) ) {
return new WP_Error(
'image_strip_meta_error',
sprintf(
/* translators: %s: ImageMagick method name. */ /* translators: %s: ImageMagick method name. */
return new WP_Error( 'image_strip_meta_error', sprintf( __( '%s is required to strip image meta.' ), '<code>Imagick::getImageProfiles()</code>' ) ); __( '%s is required to strip image meta.' ),
'<code>Imagick::getImageProfiles()</code>'
)
);
} }
if ( ! is_callable( array( $this->image, 'removeImageProfile' ) ) ) { if ( ! is_callable( array( $this->image, 'removeImageProfile' ) ) ) {
return new WP_Error(
'image_strip_meta_error',
sprintf(
/* translators: %s: ImageMagick method name. */ /* translators: %s: ImageMagick method name. */
return new WP_Error( 'image_strip_meta_error', sprintf( __( '%s is required to strip image meta.' ), '<code>Imagick::removeImageProfile()</code>' ) ); __( '%s is required to strip image meta.' ),
'<code>Imagick::removeImageProfile()</code>'
)
);
} }
/* /*

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '5.6-beta3-49545'; $wp_version = '5.6-beta3-49546';
/** /**
* 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.