Wordpress 3.7

[autoinstalls/wordpress.git] / wp-includes / class-wp-image-editor.php

diff --git a/wp-includes/class-wp-image-editor.php b/wp-includes/class-wp-image-editor.php
index 099df1e0f34e85ff8033a72595291ff8414d4ba1..81909f89be0b54eee6b55006ebdb9903416c7784 100644 (file)
--- a/wp-includes/class-wp-image-editor.php
+++ b/wp-includes/class-wp-image-editor.php
@@ -94,15 +94,22 @@ abstract class WP_Image_Editor {
        abstract public function resize( $max_w, $max_h, $crop = false );
 
        /**
        abstract public function resize( $max_w, $max_h, $crop = false );
 
        /**

-        * Processes current image and saves to disk
-        * multiple sizes from single source.
+        * Resize multiple images from a single source.

         *
         * @since 3.5.0
         * @access public
         * @abstract
         *
         *
         * @since 3.5.0
         * @access public
         * @abstract
         *

-        * @param array $sizes { {'width'=>int, 'height'=>int, 'crop'=>bool}, ... }
-        * @return array
+        * @param array $sizes {
+        *     An array of image size arrays. Default sizes are 'small', 'medium', 'large'.
+        *
+        *     @type array $size {
+        *         @type int  $width  Image width.
+        *         @type int  $height Image height.
+        *         @type bool $crop   Optional. Whether to crop the image. Default false.
+        *     }
+        * }
+        * @return array An array of resized images metadata by size.

         */
        abstract public function multi_resize( $sizes );
 
         */
        abstract public function multi_resize( $sizes );
 


@@ -144,8 +151,8 @@ abstract class WP_Image_Editor {
         * @access public
         * @abstract
         *
         * @access public
         * @abstract
         *

-        * @param boolean $horz Horizontal Flip
-        * @param boolean $vert Vertical Flip
+        * @param boolean $horz Flip along Horizontal Axis
+        * @param boolean $vert Flip along Vertical Axis

         * @return boolean|WP_Error
         */
        abstract public function flip( $horz, $vert );
         * @return boolean|WP_Error
         */
        abstract public function flip( $horz, $vert );


@@ -201,6 +208,13 @@ abstract class WP_Image_Editor {
         * @return boolean
         */
        public function set_quality( $quality ) {
         * @return boolean
         */
        public function set_quality( $quality ) {

+               /**
+                * Filter the default quality setting.
+                *
+                * @since 3.5.0
+                *
+                * @param int $quality Quality level between 0 (low) and 100 (high).
+                */

                $this->quality = apply_filters( 'wp_editor_set_quality', $quality );
 
                return ( (bool) $this->quality );
                $this->quality = apply_filters( 'wp_editor_set_quality', $quality );
 
                return ( (bool) $this->quality );


@@ -250,6 +264,15 @@ abstract class WP_Image_Editor {
                // Double-check that the mime-type selected is supported by the editor.
                // If not, choose a default instead.
                if ( ! $this->supports_mime_type( $mime_type ) ) {
                // Double-check that the mime-type selected is supported by the editor.
                // If not, choose a default instead.
                if ( ! $this->supports_mime_type( $mime_type ) ) {

+                       /**
+                        * Filter default mime type prior to getting the file extension.
+                        *
+                        * @see wp_get_mime_types()
+                        *
+                        * @since 3.5.0
+                        *
+                        * @param string $mime_type Mime type string.
+                        */

                        $mime_type = apply_filters( 'image_editor_default_mime_type', $this->default_mime_type );
                        $new_ext = $this->get_extension( $mime_type );
                }
                        $mime_type = apply_filters( 'image_editor_default_mime_type', $this->default_mime_type );
                        $new_ext = $this->get_extension( $mime_type );
                }


@@ -324,11 +347,11 @@ abstract class WP_Image_Editor {
         * @return boolean
         */
        protected function make_image( $filename, $function, $arguments ) {
         * @return boolean
         */
        protected function make_image( $filename, $function, $arguments ) {

-               $dst_file = $filename;
-

                if ( $stream = wp_is_stream( $filename ) ) {
                if ( $stream = wp_is_stream( $filename ) ) {

-                       $filename = null;

                        ob_start();
                        ob_start();

+               } else {
+                       // The directory containing the original file may no longer exist when using a replication plugin.
+                       wp_mkdir_p( dirname( $filename ) );

                }
 
                $result = call_user_func_array( $function, $arguments );
                }
 
                $result = call_user_func_array( $function, $arguments );


@@ -336,7 +359,7 @@ abstract class WP_Image_Editor {
                if ( $result && $stream ) {
                        $contents = ob_get_contents();
 
                if ( $result && $stream ) {
                        $contents = ob_get_contents();
 

-                       $fp = fopen( $dst_file, 'w' );
+                       $fp = fopen( $filename, 'w' );

 
                        if ( ! $fp )
                                return false;
 
                        if ( ! $fp )
                                return false;