Changeset 12524 for trunk/wp-admin/includes/image.php

Timestamp:

12/23/2009 06:39:31 PM (15 years ago)

Author:

ryan

Message:

Retunr WP_Error from wp_crop_image() and image_resize(). Props mdwaffe. fixes #9922

File:

• trunk/wp-admin/includes/image.php (modified) (2 diffs)

trunk/wp-admin/includes/image.php

@@ -39 +39 @@
  * @param int $src_abs Optional. If the source crop points are absolute.
  * @param string $dst_file Optional. The destination file to write to.
- * @return string New filepath on success, String error message on failure.
+ * @return string|WP_Error|false New filepath on success, WP_Error or false on failure.
  */
 function wp_crop_image( $src_file, $src_x, $src_y, $src_w, $src_h, $dst_w, $dst_h, $src_abs = false, $dst_file = false ) {
@@ -47 +47 @@
     $src = wp_load_image( $src_file );
 
-    if ( !is_resource( $src ))
-        return $src;
+    if ( !is_resource( $src ) )
+        return new WP_Error( 'error_loading_image', $src, $src_file );
 
     $dst = wp_imagecreatetruecolor( $dst_w, $dst_h );