Changeset 6812

Timestamp:

02/22/2013 04:52:36 PM (12 years ago)

Author:

boonebgorges

Message:

Remove avatar location filter after handling avatar uploads

BP filters upload_dir when handling avatar uploads, to ensure that avatar files
are stored in the proper directories. This changeset ensures that the filter is
removed after use, to ensure the integrity of calls to wp_upload_dir() later on
the crop page (after the avatar upload has been handled).

Fixes #4574

File:

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

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

@@ -519 +519 @@
     $bp->avatar_admin->original = wp_handle_upload( $file['file'], array( 'action'=> 'bp_avatar_upload' ) );
 
+    // Remove the upload_dir filter, so that other upload URLs on the page
+    // don't break
+    remove_filter( 'upload_dir', $upload_dir_filter, 10, 0 );
+
     // Move the file to the correct upload location.
     if ( !empty( $bp->avatar_admin->original['error'] ) ) {