Changeset 2957 for branches/1.2/bp-core/bp-core-avatars.php

Timestamp:

04/28/2010 05:44:28 AM (15 years ago)

Author:

johnjamesjacoby

Message:

Fixes #2206 props ipstenu

File:

• branches/1.2/bp-core/bp-core-avatars.php (modified) (1 diff)

branches/1.2/bp-core/bp-core-avatars.php

@@ -275 +275 @@
     }
 
-    /* Resize the image down to something manageable and then delete the original */
-    if ( getimagesize( $bp->avatar_admin->original['file'] ) > BP_AVATAR_ORIGINAL_MAX_WIDTH )
-        $bp->avatar_admin->resized = wp_create_thumbnail( $bp->avatar_admin->original['file'], BP_AVATAR_ORIGINAL_MAX_WIDTH );
-
-    $bp->avatar_admin->image = new stdClass;
+    /* Get image size */
+    $size = @getimagesize( $bp->avatar_admin->original['file'] );
+
+    /* Check image size and shrink if too large */
+    if ( $size[0] > BP_AVATAR_ORIGINAL_MAX_WIDTH ) {
+        $thumb = wp_create_thumbnail( $bp->avatar_admin->original['file'], BP_AVATAR_ORIGINAL_MAX_WIDTH );
+
+        /* Check for thumbnail creation errors */
+        if ( is_wp_error( $thumb ) ) {
+            bp_core_add_message( sprintf( __( 'Upload Failed! Error was: %s', 'buddypress' ), $thumb->get_error_message() ), 'error' );
+            return false;
+        }
+
+        /* Thumbnail is good so proceed */
+        $bp->avatar_admin->resized = $thumb;
+    }
 
     /* We only want to handle one image after resize. */