Changeset 23103

Timestamp:

12/06/2012 07:56:04 AM (12 years ago)

Author:

nacin

Message:

Image editors: After cropping, request new sizes from the image. If we rely on the values passed in, they may be floats. We must see what the image results in.

Cast in update_size() for sanity.

props DH-Shredder.
fixes #22779.

Location:

trunk/wp-includes

Files:

• class-wp-image-editor-gd.php (modified) (1 diff)
• class-wp-image-editor-imagick.php (modified) (2 diffs)
• class-wp-image-editor.php (modified) (1 diff)

trunk/wp-includes/class-wp-image-editor-gd.php

@@ -242 +242 @@
             imagedestroy( $this->image );
             $this->image = $dst;
-            $this->update_size( $dst_w, $dst_h );
+            $this->update_size();
             return true;
         }

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

@@ -318 +318 @@
 
                 $this->image->scaleImage( $dst_w, $dst_h );
-                return $this->update_size( $dst_w, $dst_h );
+                return $this->update_size();
             }
         }
@@ -324 +324 @@
             return new WP_Error( 'image_crop_error', $e->getMessage() );
         }
-        return $this->update_size( $src_w, $src_h );
+        return $this->update_size();
     }
 

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

@@ -186 +186 @@
     protected function update_size( $width = null, $height = null ) {
         $this->size = array(
-            'width' => $width,
-            'height' => $height
+            'width' => (int) $width,
+            'height' => (int) $height
         );
         return true;