Changeset 27726

Timestamp:

03/25/2014 09:09:34 PM (13 years ago)

Author:

helen

Message:

Use Dashicon-style images for mime type icons. Actually moving to Dashicons via the font can be explored later, but has theme/plugin implications and requires too many changes to make it for 3.9. props melchoyce for the icons. fixes #26650.

Location:

trunk

Files:

• src/wp-includes/images/media (added)
• src/wp-includes/images/media/archive.png (added)
• src/wp-includes/images/media/audio.png (added)
• src/wp-includes/images/media/code.png (added)
• src/wp-includes/images/media/default.png (added)
• src/wp-includes/images/media/document.png (added)
• src/wp-includes/images/media/interactive.png (added)
• src/wp-includes/images/media/spreadsheet.png (added)
• src/wp-includes/images/media/text.png (added)
• src/wp-includes/images/media/video.png (added)
• src/wp-includes/media.php (modified) (1 diff)
• src/wp-includes/post.php (modified) (1 diff)
• tests/phpunit/tests/media.php (modified) (1 diff)

trunk/src/wp-includes/media.php

@@ -603 +603 @@
 
         if ( $icon && $src = wp_mime_type_icon($attachment_id) ) {
-                $icon_dir = apply_filters( 'icon_dir', ABSPATH . WPINC . '/images/crystal' );
+                $icon_dir = apply_filters( 'icon_dir', ABSPATH . WPINC . '/images/media' );
                 $src_file = $icon_dir . '/' . wp_basename($src);
                 @list($width, $height) = getimagesize($src_file);

trunk/src/wp-includes/post.php

@@ -4480 +4480 @@
 
                 if ( !is_array($icon_files) ) {
-                        $icon_dir = apply_filters( 'icon_dir', ABSPATH . WPINC . '/images/crystal' );
-                        $icon_dir_uri = apply_filters( 'icon_dir_uri', includes_url('images/crystal') );
+                        $icon_dir = apply_filters( 'icon_dir', ABSPATH . WPINC . '/images/media' );
+                        $icon_dir_uri = apply_filters( 'icon_dir_uri', includes_url('images/media') );
                         $dirs = apply_filters( 'icon_dirs', array($icon_dir => $icon_dir_uri) );
                         $icon_files = array();

trunk/tests/phpunit/tests/media.php

@@ -150 +150 @@
                 $this->assertEquals( '', $prepped['subtype'] );
                 $this->assertEquals( '', $prepped['url'] );
-                $this->assertEquals( site_url( 'wp-includes/images/crystal/default.png' ), $prepped['icon'] );
+                $this->assertEquals( site_url( 'wp-includes/images/media/default.png' ), $prepped['icon'] );
 
                 // Fake a mime