Changeset 49546

Timestamp:

11/09/2020 03:33:51 PM (3 years ago)

Author:

SergeyBiryukov

Message:

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

See #50767.

File:

• trunk/src/wp-includes/class-wp-image-editor-imagick.php (modified) (3 diffs)

trunk/src/wp-includes/class-wp-image-editor-imagick.php

@@ -736 +736 @@
              */
             if ( file_put_contents( $filename, $image->getImageBlob() ) === false ) {
-                /* 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 );
+                return new WP_Error(
+                    'image_save_error',
+                    sprintf(
+                        /* translators: %s: PHP function name. */
+                        __( '%s failed while writing image to stream.' ),
+                        '<code>file_put_contents()</code>'
+                    ),
+                    $filename
+                );
             } else {
                 return true;
             }
         } else {
-            $dir_name   = dirname( $filename );
-            $dir_exists = wp_mkdir_p( $dir_name );
-
-            if ( ! $dir_exists ) {
+            $dirname = dirname( $filename );
+
+            if ( ! wp_mkdir_p( $dirname ) ) {
                 return new WP_Error(
                     'image_save_error',
@@ -751 +757 @@
                         /* translators: %s: Directory path. */
                         __( 'Unable to create directory %s. Is its parent directory writable by the server?' ),
-                        esc_html( $dir_name )
+                        esc_html( $dirname )
                     )
                 );
@@ -802 +808 @@
 
         if ( ! is_callable( array( $this->image, 'getImageProfiles' ) ) ) {
-            /* 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>' ) );
+            return new WP_Error(
+                'image_strip_meta_error',
+                sprintf(
+                    /* translators: %s: ImageMagick method name. */
+                    __( '%s is required to strip image meta.' ),
+                    '<code>Imagick::getImageProfiles()</code>'
+                )
+            );
         }
 
         if ( ! is_callable( array( $this->image, 'removeImageProfile' ) ) ) {
-            /* 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>' ) );
+            return new WP_Error(
+                'image_strip_meta_error',
+                sprintf(
+                    /* translators: %s: ImageMagick method name. */
+                    __( '%s is required to strip image meta.' ),
+                    '<code>Imagick::removeImageProfile()</code>'
+                )
+            );
         }