Changeset 57846 for branches/6.5

Timestamp:

03/15/2024 08:56:20 PM (2 years ago)

Author:

joedolson

Message:

Media: Fall back to available icons if SVG media icons not found.

Follow up to [57687]. If no icons of the preferred type are available, then the icon array should return the collection of valid icons found, rather than an empty array.

Props dglingren, sabernhardt, swissspidy, sabernhardt, antpb, joedolson.
Reviewed by swissspidy.
Merges [57845] to the 6.5 branch.
Fixes #60740.

Location:

branches/6.5

Files:

• . (modified) (1 prop)
• src/wp-includes/post.php (modified) (3 diffs)

branches/6.5/src/wp-includes/post.php

@@ -6869 +6869 @@
                         $dirs       = apply_filters( 'icon_dirs', array( $icon_dir => $icon_dir_uri ) );
                         $icon_files = array();
+                        $all_icons  = array();
                         while ( $dirs ) {
                                 $keys = array_keys( $dirs );
@@ -6888 +6889 @@
                                                         continue;
                                                 }
+                                                $all_icons[ "$dir/$file" ] = "$uri/$file";
                                                 if ( $ext === $preferred_ext ) {
                                                         $icon_files[ "$dir/$file" ] = "$uri/$file";
@@ -6894 +6896 @@
                                         closedir( $dh );
                                 }
+                        }
+                        // If directory only contained icons of a non-preferred format, return those.
+                        if ( empty( $icon_files ) ) {
+                                $icon_files = $all_icons;
                         }
                         wp_cache_add( 'icon_files', $icon_files, 'default', 600 );