Changeset 34255

Timestamp:

09/17/2015 12:36:12 AM (10 years ago)

Author:

wonderboymusic

Message:

In wp_mime_type_icon(), the length of the $wilds array varies depending on what is passed as $mime. Loop over $wilds instead of arbitrarily checking $wilds[0].

Adds unit tests.

Fixes #33012.

Location:

trunk

Files:

• src/wp-includes/post-functions.php (modified) (1 diff)
• tests/phpunit/tests/post/attachments.php (modified) (2 diffs)

trunk/src/wp-includes/post-functions.php

@@ -5082 +5082 @@
 
         foreach ( $matches as $match => $wilds ) {
-            if ( isset($types[$wilds[0]])) {
-                $icon = $types[$wilds[0]];
-                if ( !is_numeric($mime) )
-                    wp_cache_add("mime_type_icon_$mime", $icon);
-                break;
+            foreach ( $wilds as $wild ) {
+                if ( ! isset( $types[ $wild ] ) ) {
+                    continue;
+                }
+
+                $icon = $types[ $wild ];
+                if ( ! is_numeric( $mime ) ) {
+                    wp_cache_add( "mime_type_icon_$mime", $icon );
+                }
+                break 2;
             }
         }

trunk/tests/phpunit/tests/post/attachments.php

@@ -513 +513 @@
         $upload = wp_upload_bits( basename( $filename ), null, $contents );
 
+        remove_filter( 'upload_mimes', array( $this, 'blacklist_jpg_mime_type' ) );
+
         $this->assertNotEmpty( $upload['error'] );
-
-        remove_filter( 'upload_mimes', array( $this, 'blacklist_jpg_mime_type' ) );
     }
 
@@ -527 +527 @@
         return $mimes;
     }
+
+    /**
+     * @ticket 33012
+     */
+    public function test_wp_mime_type_icon() {
+        $icon = wp_mime_type_icon();
+
+        $this->assertContains( 'images/media/default.png', $icon );
+    }
+
+    /**
+     * @ticket 33012
+     */
+    public function test_wp_mime_type_icon_video() {
+        $icon = wp_mime_type_icon( 'video/mp4' );
+
+        $this->assertContains( 'images/media/video.png', $icon );
+    }
 }