Changeset 42813 for branches/4.9

Timestamp:

03/09/2018 03:20:52 AM (9 years ago)

Author:

mikeschroder

Message:

Media: Correctly allow changing PDF thumbnail crop value.

Corrects logic that kept plugins from setting crop value of intermediate image sizes for rendered PDFs.
Adds test.

Props leemon, SergeyBiryukov, chetan200891, birgire.
Merges [42792] to the 4.9 branch.
Fixes #43226.

Location:

branches/4.9

Files:

• . (modified) (1 prop)
• src/wp-admin/includes/image.php (modified) (1 diff)
• tests/phpunit/tests/image/functions.php (modified) (1 diff)

branches/4.9/src/wp-admin/includes/image.php

@@ -242 +242 @@
                         } else {
                                 // Force thumbnails to be soft crops.
-                                if ( ! 'thumbnail' === $s ) {
+                                if ( 'thumbnail' !== $s ) {
                                         $sizes[ $s ]['crop'] = get_option( "{$s}_crop" );
                                 }

branches/4.9/tests/phpunit/tests/image/functions.php

@@ -417 +417 @@
 
         /**
+         * Crop setting for PDF.
+         *
+         * @ticket 43226
+         */
+        public function test_crop_setting_for_pdf() {
+
+                if ( ! wp_image_editor_supports( array( 'mime_type' => 'application/pdf' ) ) ) {
+                        $this->markTestSkipped( 'Rendering PDFs is not supported on this system.' );
+                }
+
+                update_option( 'medium_crop', 1 );
+
+                $orig_file = DIR_TESTDATA . '/images/wordpress-gsoc-flyer.pdf';
+                $test_file = get_temp_dir() . 'wordpress-gsoc-flyer.pdf';
+                copy( $orig_file, $test_file );
+
+                $attachment_id = $this->factory->attachment->create_object(
+                        $test_file, 0, array(
+                                'post_mime_type' => 'application/pdf',
+                        )
+                );
+
+                $this->assertNotEmpty( $attachment_id );
+
+                $expected = array(
+                        'sizes' => array(
+                                'thumbnail' => array(
+                                        'file'      => 'wordpress-gsoc-flyer-pdf-116x150.jpg',
+                                        'width'     => 116,
+                                        'height'    => 150,
+                                        'mime-type' => 'image/jpeg',
+                                ),
+                                'medium'    => array(
+                                        'file'      => 'wordpress-gsoc-flyer-pdf-300x300.jpg',
+                                        'width'     => 300,
+                                        'height'    => 300,
+                                        'mime-type' => 'image/jpeg',
+                                ),
+                                'large'     => array(
+                                        'file'      => 'wordpress-gsoc-flyer-pdf-791x1024.jpg',
+                                        'width'     => 791,
+                                        'height'    => 1024,
+                                        'mime-type' => 'image/jpeg',
+                                ),
+                                'full'      => array(
+                                        'file'      => 'wordpress-gsoc-flyer-pdf.jpg',
+                                        'width'     => 1088,
+                                        'height'    => 1408,
+                                        'mime-type' => 'image/jpeg',
+                                ),
+                        ),
+                );
+
+                $metadata = wp_generate_attachment_metadata( $attachment_id, $test_file );
+                $this->assertSame( $expected, $metadata );
+
+                unlink( $test_file );
+                foreach ( $metadata['sizes'] as $size ) {
+                        unlink( get_temp_dir() . $size['file'] );
+                }
+        }
+
+        /**
          * @ticket 39231
          */