Changeset 432 for trunk/bp-core/bp-core-avatars.php

Timestamp:

10/24/2008 10:48:52 AM (17 years ago)

Author:

apeatling

Message:

Fixed bug where blog signup would cause validation errors with missing first and last name.

Fixed bug where avatar images larger than allowed max upload size would not throw an error.

File:

• trunk/bp-core/bp-core-avatars.php (modified) (3 diffs)

trunk/bp-core/bp-core-avatars.php

@@ -14 +14 @@
 define( 'CORE_AVATAR_V2_W', 150 );
 define( 'CORE_AVATAR_V2_H', 150 );
+define( 'CORE_CROPPING_CANVAS_MAX', 450 );
 define( 'CORE_MAX_FILE_SIZE', get_site_option('fileupload_maxk') * 1024 );
 define( 'CORE_DEFAULT_AVATAR', site_url() . '/wp-content/mu-plugins/bp-xprofile/images/none.gif' );
@@ -118 +119 @@
         $uploadErrors = array(
                 0 => __("There is no error, the file uploaded with success", 'buddypress'), 
-                1 => __("The uploaded file exceeds the upload_max_filesize directive in php.ini", 'buddypress'), 
-                2 => __("The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form", 'buddypress'),
+                1 => __("Your image was bigger than the maximum allowed file size of: ", 'buddypress') . size_format(CORE_MAX_FILE_SIZE), 
+                2 => __("Your image was bigger than the maximum allowed file size of: ", 'buddypress') . size_format(CORE_MAX_FILE_SIZE),
                 3 => __("The uploaded file was only partially uploaded", 'buddypress'),
                 4 => __("No file was uploaded", 'buddypress'),
@@ -235 +236 @@
 }
 
-function bp_core_resize_avatar($file, $size = CORE_CROPPING_CANVAS_MAX) {
+function bp_core_resize_avatar( $file, $size = false ) {
+    
+    if ( !$size )
+        $size = CORE_CROPPING_CANVAS_MAX;
+
     $canvas = wp_create_thumbnail( $file, $size );