Ticket #39330: 39330.patch

class-wp-image-editor-imagick.php

@@ -155 +155 @@
 
                         // Reading image after Imagick instantiation because `setResolution`
                         // only applies correctly before the image is read.
-                        $this->image->readImage( $filename );
+                        if ( filter_var( $this->file, FILTER_VALIDATE_URL ) !== false ) {
+                                if ( defined( 'WP_PROXY_HOST' ) && defined( 'WP_PROXY_PORT' ) ) {
+                                        $context = stream_context_create(
+                                                array(
+                                                        'http' => array(
+                                                                'proxy'           => 'tcp://' . WP_PROXY_HOST . ':' . WP_PROXY_PORT,
+                                                                'request_fulluri' => true,
+                                                        )
+                                                )
+                                        );
+                                } else {
+                                        $context = stream_context_get_default();
+                                }
 
+                                $document = fopen( $filename, 'r', false, $context );
+                                $this->image->readImageFile( $document );
+                                fclose( $document );
+                        } else {
+                                $this->image->readImage( $filename );
+                        }
+
                         if ( ! $this->image->valid() )
                                 return new WP_Error( 'invalid_image', __('File is not an image.'), $this->file);
 
@@ -754 +773 @@
                         $this->image->setResolution( 128, 128 );
 
                         // Only load the first page.
-                        return $this->file . '[0]';
+                        // Only load the first page.
+                        if ( filter_var( $this->file, FILTER_VALIDATE_URL ) !== false ) {
+                                return $this->file;
+                        } else {
+                                return $this->file . '[0]';
+                        }
                 }
                 catch ( Exception $e ) {
                         return new WP_Error( 'pdf_setup_failed', $e->getMessage(), $this->file );