Changeset 7943 for trunk/bp-core/bp-core-avatars.php

Timestamp:

02/20/2014 09:27:47 PM (11 years ago)

Author:

boonebgorges

Message:

Sanity check before deleting old avatar files before cropping new ones

Previously, if a user uploaded a new avatar file that had a name format like
an existing BP avatar file, BP would accidentally wipe that file out before
cropping. This would result in a failed crop, because the just-uploaded image
would be gone. This changeset introduces a sanity check: only delete existing
avatar files if the filename for those files is not the same as the uploaded
file.

Fixes #5417

File:

• trunk/bp-core/bp-core-avatars.php (modified) (1 diff)

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

@@ -751 +751 @@
 
     // Delete the existing avatar files for the object
-    bp_core_delete_existing_avatar( array( 'object' => $object, 'avatar_path' => $avatar_folder_dir ) );
+    $existing_avatar = bp_core_fetch_avatar( array(
+        'object'  => $object,
+        'item_id' => $item_id,
+        'html' => false,
+    ) );
+
+    if ( ! empty( $existing_avatar ) ) {
+        // Check that the new avatar doesn't have the same name as the
+        // old one before deleting
+        $upload_dir           = wp_upload_dir();
+        $existing_avatar_path = str_replace( $upload_dir['baseurl'], '', $existing_avatar );
+        $new_avatar_path      = str_replace( $upload_dir['basedir'], '', $original_file );
+
+        if ( $existing_avatar_path !== $new_avatar_path ) {
+            bp_core_delete_existing_avatar( array( 'object' => $object, 'avatar_path' => $avatar_folder_dir ) );
+        }
+    }
+
+
 
     // Make sure we at least have a width and height for cropping