Changeset 11875 for trunk/src/bp-core/classes/class-bp-attachment-cover-image.php

Timestamp:

03/02/2018 07:37:55 PM (8 years ago)

Author:

boonebgorges

Message:

Centralize the generation of the cover image upload directory.

By using bp_attachments_cover_image_upload_dir() wherever the cover image
directory is needed, we ensure that it's possible to filter consistently, for
installations (such as multi-network installations) that may want a custom
location for these files.

Props rekmla, imath.
Fixes #7265.

File:

• trunk/src/bp-core/classes/class-bp-attachment-cover-image.php (modified) (1 diff)

trunk/src/bp-core/classes/class-bp-attachment-cover-image.php

@@ -97 +97 @@
      */
     public function upload_dir_filter( $upload_dir = array() ) {
-        // Default values are for profiles.
-        $object_id = bp_displayed_user_id();
-
-        if ( empty( $object_id ) ) {
-            $object_id = bp_loggedin_user_id();
-        }
-
-        $object_directory = 'members';
-
-        // We're in a group, edit default values.
-        if ( bp_is_group() || bp_is_group_create() ) {
-            $object_id        = bp_get_current_group_id();
-            $object_directory = 'groups';
-        }
-
-        // Set the subdir.
-        $subdir  = '/' . $object_directory . '/' . $object_id . '/cover-image';
-
-        /**
-         * Filters the cover image upload directory.
-         *
-         * @since 2.4.0
-         *
-         * @param array $value      Array containing the path, URL, and other helpful settings.
-         * @param array $upload_dir The original Uploads dir.
-         */
-        return apply_filters( 'bp_attachments_cover_image_upload_dir', array(
-            'path'    => $this->upload_path . $subdir,
-            'url'     => $this->url . $subdir,
-            'subdir'  => $subdir,
-            'basedir' => $this->upload_path,
-            'baseurl' => $this->url,
-            'error'   => false
-        ), $upload_dir );
+        return bp_attachments_cover_image_upload_dir();
     }