Changeset 13215 for trunk/src/bp-activity/bp-activity-template.php

Timestamp:

01/19/2022 09:21:45 PM (3 years ago)

Author:

imath

Message:

Make it possible to disable Avatar history & richer logging activities

Advanced users wishing to:

1. disable the Avatar history feature, can do so returning true when filtering 'bp_disable_avatar_history',
2. prevent one or more logging activity types to have a richer output, can return an array of the allowed activity types (or an empty array to completely disable the feature) when filtering 'bp_activity_get_types_supporting_generated_content'.

Props sbrajesh, oztaser

Fixes #8617

File:

• trunk/src/bp-activity/bp-activity-template.php (modified) (1 diff)

trunk/src/bp-activity/bp-activity-template.php

@@ -1463 +1463 @@
             // Set generated content properties.
             if ( 'new_avatar' === $activity_type ) {
-                $avatars = bp_avatar_get_version( $user_id, 'user', bp_get_activity_date_recorded() );
-
-                if ( $avatars && 1 === count( $avatars ) ) {
-                    $avatar            = reset( $avatars );
-                    $historical_avatar = trailingslashit( $avatar->parent_dir_url ) . $avatar->name;
-
-                    // Add historical avatar to the current activity.
+                $avatars = array();
+
+                // Use the avatar history to display the avatar that was in use at the time the activity was posted.
+                if ( ! bp_avatar_history_is_disabled() ) {
+                    $avatars = bp_avatar_get_version( $user_id, 'user', bp_get_activity_date_recorded() );
+
+                    if ( $avatars && 1 === count( $avatars ) ) {
+                        $avatar            = reset( $avatars );
+                        $historical_avatar = trailingslashit( $avatar->parent_dir_url ) . $avatar->name;
+
+                        // Add historical avatar to the current activity.
+                        $generated_content->user_profile_photo = array(
+                            'value'             => $historical_avatar,
+                            'sanitize_callback' => 'esc_url',
+                        );
+                    }
+
+                    // Otherwise use the current/latest avatar.
+                } else {
                     $generated_content->user_profile_photo = array(
-                        'value'             => $historical_avatar,
+                        'value'             => bp_core_fetch_avatar(
+                            array(
+                                'item_id' => $user_id,
+                                'object'  => 'user',
+                                'type'    => 'full',
+                                'width'   => bp_core_avatar_full_width(),
+                                'height'  => bp_core_avatar_full_height(),
+                                'html'    => false,
+                            )
+                        ),
                         'sanitize_callback' => 'esc_url',
                     );
-
-                    // Do not use a generated content.
-                } else {
-                    return false;
                 }
             }