Changeset 2124

Timestamp:

11/25/2009 12:34:55 PM (15 years ago)

Author:

johnjamesjacoby

Message:

Fixes #1184

File:

• branches/1.1/bp-core/bp-core-avatars.php (modified) (2 diffs)

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

@@ -222 +222 @@
 
     $uploadErrors = array(
-        0 => __("There is no error, the file uploaded with success", 'buddypress'),
-        1 => __("Your image was bigger than the maximum allowed file size of: ", 'buddypress') . size_format(BP_AVATAR_ORIGINAL_MAX_FILESIZE),
-        2 => __("Your image was bigger than the maximum allowed file size of: ", 'buddypress') . size_format(BP_AVATAR_ORIGINAL_MAX_FILESIZE),
-        3 => __("The uploaded file was only partially uploaded", 'buddypress'),
-        4 => __("No file was uploaded", 'buddypress'),
-        6 => __("Missing a temporary folder", 'buddypress')
+        0 => __("There is no error, the file uploaded with success", 'buddypress'),
+        1 => __("Your image was bigger than the maximum allowed file size of: ", 'buddypress') . size_format(BP_AVATAR_ORIGINAL_MAX_FILESIZE),
+        2 => __("Your image was bigger than the maximum allowed file size of: ", 'buddypress') . size_format(BP_AVATAR_ORIGINAL_MAX_FILESIZE),
+        3 => __("The uploaded file was only partially uploaded", 'buddypress'),
+        4 => __("No file was uploaded", 'buddypress'),
+        6 => __("Missing a temporary folder", 'buddypress')
     );
 
@@ -269 +269 @@
         $bp->avatar_admin->image->dir = $bp->avatar_admin->resized;
         @unlink( $bp->avatar_admin->original['file'] );
+    }
+
+    /* Check for WP_Error on what should be an image */
+    if ( is_wp_error( $bp->avatar_admin->image->dir ) ) {
+        bp_core_add_message( sprintf( __( 'Upload failed! Error was: %s', 'buddypress' ), $bp->avatar_admin->image->dir->get_error_message() ), 'error' );
+        return false;
     }