Changeset 13134

Timestamp:

10/30/2021 05:27:30 PM (5 years ago)

Author:

imath

Message:

Improve 2 Core Attachments functions

• stop using a switch() statement in favor of some if/else ones to avoid a possible notice error when getting all allowed BP Attachements.
• stop using wp_match_mime_types() inside the bp_attachments_get_allowed_mimes() function. Using wp_match_mime_types() was generating unconsistent results when trying to get all BP Attachments allowed mime types.

Fixes #8595 (really)

File:

• trunk/src/bp-core/bp-core-attachments.php (modified) (2 diffs)

trunk/src/bp-core/bp-core-attachments.php

@@ -175 +175 @@
                 $exts = array();
 
-                switch ( $type ) {
-                        case 'video':
-                                $exts = wp_get_video_extensions();
-                        break;
-
-                        case 'audio':
-                                $exts = wp_get_audio_extensions();
-                        break;
-
-                        case isset( $wp_exts[ $type ] ):
-                                $exts = $wp_exts[ $type ];
-                        break;
-
-                        default:
-                                $allowed_mimes = get_allowed_mime_types();
-
-                                /**
-                                 * Search for allowed mimes matching the type.
-                                 *
-                                 * Eg: using 'application/vnd.oasis' as the $type
-                                 * parameter will get all OpenOffice extensions supported
-                                 * by WordPress and allowed for the current user.
-                                 */
-                                if ( '' !== $type ) {
-                                        $allowed_mimes = preg_grep( '/' . addcslashes( $type, '/.+-' ) . '/', $allowed_mimes );
-                                }
-
-                                $allowed_types = array_keys( $allowed_mimes );
-
-                                // Loop to explode keys using '|'.
-                                foreach ( $allowed_types as $allowed_type ) {
-                                        $t = explode( '|', $allowed_type );
-                                        $exts = array_merge( $exts, (array) $t );
-                                }
-                        break;
+                if ( 'video' === $type ) {
+                        $exts = wp_get_video_extensions();
+                } elseif ( 'audio' === $type ) {
+                        $exts = wp_get_audio_extensions();
+                } elseif ( isset( $wp_exts[ $type ] ) ) {
+                        $exts = $wp_exts[ $type ];
+                } else {
+                        $allowed_mimes = get_allowed_mime_types();
+
+                        /**
+                         * Search for allowed mimes matching the type.
+                         *
+                         * Eg: using 'application/vnd.oasis' as the $type
+                         * parameter will get all OpenOffice extensions supported
+                         * by WordPress and allowed for the current user.
+                         */
+                        if ( '' !== $type ) {
+                                $allowed_mimes = preg_grep( '/' . addcslashes( $type, '/.+-' ) . '/', $allowed_mimes );
+                        }
+
+                        $allowed_types = array_keys( $allowed_mimes );
+
+                        // Loop to explode keys using '|'.
+                        foreach ( $allowed_types as $allowed_type ) {
+                                $t = explode( '|', $allowed_type );
+                                $exts = array_merge( $exts, (array) $t );
+                        }
                 }
         }
@@ -238 +230 @@
         }
 
-        $validate_mimes = wp_match_mime_types( join( ',', $allowed_types ), wp_get_mime_types() );
-        $allowed_mimes  = array_map( 'implode', $validate_mimes );
+        $wp_mimes      = wp_get_mime_types();
+        $allowed_mimes = array();
+
+        foreach ( $allowed_types as $allowed_type ) {
+                $filetype = wp_check_filetype( '.' . $allowed_type, $wp_mimes );
+
+                if ( false === $filetype['ext'] || false === $filetype['type'] ) {
+                        continue;
+                }
+
+                $allowed_mimes[ $filetype['ext'] ] = $filetype['type'];
+        }
 
         /**