Changeset 13215 for trunk/src/bp-core/classes/class-bp-attachment-avatar.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-core/classes/class-bp-attachment-avatar.php (modified) (2 diffs)

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

@@ -247 +247 @@
         }
 
-        // Delete the existing avatar files for the object.
-        $existing_avatar = bp_core_fetch_avatar( array(
-            'object'  => $args['object'],
-            'item_id' => $args['item_id'],
-            'html' => false,
-        ) );
+        // Get the existing avatar files for the object.
+        $existing_avatar = bp_core_fetch_avatar(
+            array(
+                'object'  => $args['object'],
+                'item_id' => $args['item_id'],
+                'html'    => false,
+            )
+        );
 
         /**
@@ -259 +261 @@
          */
         if ( ! empty( $existing_avatar ) && $existing_avatar !== $this->url . $relative_path ) {
-            // Add a new revision for the existing avatar.
-            $avatars = bp_attachments_list_directory_files( $avatar_folder_dir );
-
-            if ( $avatars ) {
-                foreach ( $avatars as $avatar_file ) {
-                    if ( ! isset( $avatar_file->name, $avatar_file->id, $avatar_file->path ) ) {
-                        continue;
-                    }
-
-                    $is_full  = preg_match( "/-bpfull/", $avatar_file->name );
-                    $is_thumb = preg_match( "/-bpthumb/", $avatar_file->name );
-
-                    if ( $is_full || $is_thumb ) {
-                        $revision = $this->add_revision(
-                            'avatar',
-                            array(
-                                'file_abspath' => $avatar_file->path,
-                                'file_id'      => $avatar_file->id,
-                            )
-                        );
-
-                        if ( is_wp_error( $revision ) ) {
-                            error_log( $revision->get_error_message() );
+            // Avatar history is disabled, simply delete the existing avatar files.
+            if ( bp_avatar_history_is_disabled() ) {
+                bp_core_delete_existing_avatar(
+                    array(
+                        'object'      => $args['object'],
+                        'item_id'     => $args['item_id'],
+                        'avatar_path' => $avatar_folder_dir,
+                    )
+                );
+            } else {
+                // Add a new revision for the existing avatar.
+                $avatars = bp_attachments_list_directory_files( $avatar_folder_dir );
+
+                if ( $avatars ) {
+                    foreach ( $avatars as $avatar_file ) {
+                        if ( ! isset( $avatar_file->name, $avatar_file->id, $avatar_file->path ) ) {
+                            continue;
+                        }
+
+                        $is_full  = preg_match( "/-bpfull/", $avatar_file->name );
+                        $is_thumb = preg_match( "/-bpthumb/", $avatar_file->name );
+
+                        if ( $is_full || $is_thumb ) {
+                            $revision = $this->add_revision(
+                                'avatar',
+                                array(
+                                    'file_abspath' => $avatar_file->path,
+                                    'file_id'      => $avatar_file->id,
+                                )
+                            );
+
+                            if ( is_wp_error( $revision ) ) {
+                                error_log( $revision->get_error_message() );
+                            }
                         }
                     }