Changeset 49542

Timestamp:

11/09/2020 01:16:54 PM (4 years ago)

Author:

johnbillion

Message:

Media: Restore the ability of WP_Image_Editor_Imagick->save() to create a missing directory when needed.

Props eemitch, mikeschroder, hellofromTonya, p00ya, johnbillion

Fixes #51665

Location:

trunk

Files:

• src/wp-includes/class-wp-image-editor-imagick.php (modified) (1 diff)
• tests/phpunit/tests/image/editorImagick.php (modified) (1 diff)

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

@@ -742 +742 @@
             }
         } else {
+            $dir_name   = dirname( $filename );
+            $dir_exists = wp_mkdir_p( $dir_name );
+
+            if ( ! $dir_exists ) {
+                return new WP_Error(
+                    'image_save_error',
+                    sprintf(
+                        /* translators: %s: Directory path. */
+                        __( 'Unable to create directory %s. Is its parent directory writable by the server?' ),
+                        esc_html( $dir_name )
+                    )
+                );
+            }
+
             try {
                 return $image->writeImage( $filename );

trunk/tests/phpunit/tests/image/editorImagick.php

@@ -598 +598 @@
         unlink( $temp_file );
     }
+
+    /**
+     * @ticket 51665
+     */
+    public function test_directory_creation() {
+        $file      = realpath( DIR_TESTDATA ) . '/images/a2-small.jpg';
+        $directory = realpath( DIR_TESTDATA ) . '/images/nonexistent-directory';
+        $editor    = new WP_Image_Editor_Imagick( $file );
+
+        $this->assertFileNotExists( $directory );
+
+        $loaded = $editor->load();
+        $this->assertNotWPError( $loaded );
+
+        $resized = $editor->resize( 100, 100, true );
+        $this->assertNotWPError( $resized );
+
+        $saved = $editor->save( $directory . '/a2-small-cropped.jpg' );
+        $this->assertNotWPError( $saved );
+
+        unlink( $directory . '/a2-small-cropped.jpg' );
+        rmdir( $directory );
+    }
 }