Changeset 10134 for branches/2.3/src/bp-xprofile/bp-xprofile-activity.php

Timestamp:

09/24/2015 10:28:21 AM (9 years ago)

Author:

imath

Message:

Make sure the xprofile_avatar_uploaded action is fired once the avatar of the user is set.

In 2.3.0, we introduced a new UI to manage avatar. It now uses Ajax to upload and set the avatar. Unfortunately a confusion was made about the xprofile_avatar_uploaded action. It was firing immediately after the avatar was uploaded but before it has been set using the cropping tool.

This commit is:

• making sure the action is fired at the right time
• adding new parameters to the action to inform about the User ID and the way the avatar was set ("crop" or "camera")
• making sure an activity will be generated if the avatar was set within the wp-admin/extended-profile.

Props r-a-y, landwire

See #6612 (branch 2.3)

File:

• branches/2.3/src/bp-xprofile/bp-xprofile-activity.php (modified) (2 diffs)

branches/2.3/src/bp-xprofile/bp-xprofile-activity.php

@@ -203 +203 @@
  * Adds an activity stream item when a user has uploaded a new avatar.
  *
- * @since BuddyPress (1.0.0)
+ * @since 1.0.0
+ * @since 2.3.4 Add new parameter to get the user id the avatar was set for
  *
  * @package BuddyPress XProfile
  * @uses bp_activity_add() Adds an entry to the activity component tables for a
  *                         specific activity
- */
-function bp_xprofile_new_avatar_activity() {
-
-    // Bail if activity component is not active
-    if ( ! bp_is_active( 'activity' ) ) {
-        return false;
+ *
+ * @param  int $user_id The user id the avatar was set for
+ */
+function bp_xprofile_new_avatar_activity( $user_id = 0 ) {
+
+    // Bail if activity component is not active
+    if ( ! bp_is_active( 'activity' ) ) {
+        return false;
+    }
+
+    if ( empty( $user_id ) ) {
+        $user_id = bp_displayed_user_id();
     }
 
@@ -219 +226 @@
      * Filters the user ID when a user has uploaded a new avatar.
      *
-     * @since BuddyPress (1.5.0)
-     *
-     * @param int $value ID of the displayed user.
-     */
-    $user_id = apply_filters( 'bp_xprofile_new_avatar_user_id', bp_displayed_user_id() );
+     * @since 1.5.0
+     *
+     * @param int $user_id ID of the user the avatar was set for.
+     */
+    $user_id = apply_filters( 'bp_xprofile_new_avatar_user_id', $user_id );
 
     // Add the activity