Changeset 9831 for trunk/src/bp-core/classes/class-bp-attachment-avatar.php

Timestamp:

05/02/2015 08:55:07 PM (10 years ago)

Author:

imath

Message:

Make sure the BP Attachments API behaves the right way when WordPress < 4.0

Before WordPress 4.0, there was no dynamic filter based on the name of the action posted in the upload form. So we also need to filter wp_handle_upload_prefilter to make sure the BP_Attachments->validate_upload() function will actually validate the uploads for versions of WordPress < 4.0.

Improve the i18n of the avatar type error, as the avatar types can now be filtered in the BP_Attachment_Avatar class.

Add unit tests for the BP Attachement class.

Fixes #6278

File:

• trunk/src/bp-core/classes/class-bp-attachment-avatar.php (modified) (2 diffs)

trunk/src/bp-core/classes/class-bp-attachment-avatar.php

@@ -29 +29 @@
      */
     public function __construct() {
+        // Allowed avatar types
+        $allowed_types = bp_core_get_allowed_avatar_types();
+
         parent::__construct( array(
             'action'                => 'bp_avatar_upload',
@@ -37 +40 @@
             'upload_error_strings'  => array(
                 9  => sprintf( __( 'That photo is too big. Please upload one smaller than %s', 'buddypress' ), size_format( bp_core_avatar_original_max_filesize() ) ),
-                10 => __( 'Please upload only JPG, GIF or PNG photos.', 'buddypress' ),
+                10 => sprintf( _n( 'Please upload only this file type: %s.', 'Please upload only these file types: %s.', count( $allowed_types ), 'buddypress' ), self::get_avatar_types( $allowed_types ) ),
             ),
         ) );
+    }
+
+    /**
+     * Gets the available avatar types
+     *
+     * @since BuddyPress (2.3.0)
+     * @return string comma separated list of allowed avatar types
+     */
+    public static function get_avatar_types( $allowed_types = array() ) {
+        $types = array_map( 'strtoupper', $allowed_types );
+        $comma = _x( ',', 'avatar types separator', 'buddypress' );
+        return join( $comma . ' ', $types );
     }