Changeset 9826 for trunk/src/bp-core/bp-core-avatars.php

Timestamp:

04/30/2015 07:57:11 PM (11 years ago)

Author:

imath

Message:

Avatar UI : improve user feedback messages

• Display a message informing the user can delete his current avatar using the "Delete" tab of the UI.
• Eventually display a message informing the user the image uploaded have smaller dimensions than the avatar full dimensions.

Props r-a-y

See #6290

File:

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

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

@@ -948 +948 @@
         }
 
+        // Init the feedback message
+        $feedback_message = false;
+
+        if ( ! empty( $bp->template_message ) ) {
+                $feedback_message = $bp->template_message;
+
+                // Remove template message.
+                $bp->template_message      = false;
+                $bp->template_message_type = false;
+                @setcookie( 'bp-message', false, time() - 1000, COOKIEPATH );
+                @setcookie( 'bp-message-type', false, time() - 1000, COOKIEPATH );
+        }
+
         if ( empty( $avatar ) ) {
                 // Default upload error
-                $message = array();
-
-                // Intercept the template message and remove it
-                if ( ! empty( $bp->template_message ) ) {
-                        // Set the feedback message
-                        $message = array(
-                                'type'    => 'upload_error',
-                                'message' => $bp->template_message,
-                        );
-
-                        // Remove template message.
-                        $bp->template_message      = false;
-                        $bp->template_message_type = false;
-                        @setcookie( 'bp-message', false, time() - 1000, COOKIEPATH );
-                        @setcookie( 'bp-message-type', false, time() - 1000, COOKIEPATH );
-                }
-
-                bp_attachments_json_response( false, $is_html4, $message );
+                $message = __( 'Upload failed.', 'buddypress' );
+
+                // Use the template message if set
+                if ( ! empty( $feedback_message ) ) {
+                        $message = $feedback_message;
+                }
+
+                // Upload error reply
+                bp_attachments_json_response( false, $is_html4, array(
+                        'type'    => 'upload_error',
+                        'message' => $message,
+                ) );
         }
 
@@ -991 +998 @@
                 'width'     => $uploaded_image[0],
                 'height'    => $uploaded_image[1],
+                'feedback'  => $feedback_message,
         ) );
 }