Changeset 39580 for trunk

Timestamp:

12/12/2016 06:18:30 AM (8 years ago)

Author:

dd32

Message:

PDF Images: Avoid a PHP Warning when attempting to process a file without an extension.

Props chandrapatel for initial patch.
Fixes #39195.

Location:

trunk

Files:

• src/wp-includes/class-wp-image-editor-imagick.php (modified) (1 diff)
• tests/phpunit/data/images/test-image-no-extension (copied) (copied from trunk/tests/phpunit/data/images/test-image.gif)
• tests/phpunit/tests/image/editor_gd.php (modified) (1 diff)
• tests/phpunit/tests/image/editor_imagick.php (modified) (1 diff)

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

@@ -147 +147 @@
         try {
             $this->image = new Imagick();
-            $file_parts = pathinfo( $this->file );
+            $file_extension = strtolower( pathinfo( $this->file, PATHINFO_EXTENSION ) );
             $filename = $this->file;
 
-            if ( 'pdf' == strtolower( $file_parts['extension'] ) ) {
+            if ( 'pdf' == $file_extension ) {
                 $filename = $this->pdf_setup();
             }

trunk/tests/phpunit/tests/image/editor_gd.php

@@ -543 +543 @@
 
     }
+
+    /**
+     * Test WP_Image_Editor_GD handles extension-less images
+     * @ticket 39195
+     */
+    public function test_image_non_existent_extension() {
+        $image_editor = new WP_Image_Editor_GD( DIR_TESTDATA.'/images/test-image-no-extension' );
+        $result = $image_editor->load();
+
+        $this->assertTrue( $result );
+    }
 }

trunk/tests/phpunit/tests/image/editor_imagick.php

@@ -532 +532 @@
         unlink( $save_to_file );
     }
+
+    /**
+     * Test WP_Image_Editor_Imagick handles extension-less images
+     * @ticket 39195
+     */
+    public function test_image_non_existent_extension() {
+        $image_editor = new WP_Image_Editor_Imagick( DIR_TESTDATA.'/images/test-image-no-extension' );
+        $result = $image_editor->load();
+
+        $this->assertTrue( $result );
+    }
 }