WordPress.org
Get WordPress

Make WordPress Core

Changeset 27726


Ignore:
Timestamp:
03/25/2014 09:09:34 PM (11 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:
10 added
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/wp-includes/media.php

    r27668 r27726  
    603603
    604604    if ( $icon && $src = wp_mime_type_icon($attachment_id) ) {
    605         $icon_dir = apply_filters( 'icon_dir', ABSPATH . WPINC . '/images/crystal' );
     605        $icon_dir = apply_filters( 'icon_dir', ABSPATH . WPINC . '/images/media' );
    606606        $src_file = $icon_dir . '/' . wp_basename($src);
    607607        @list($width, $height) = getimagesize($src_file);

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

    r27657 r27726  
    44804480
    44814481        if ( !is_array($icon_files) ) {
    4482             $icon_dir = apply_filters( 'icon_dir', ABSPATH . WPINC . '/images/crystal' );
    4483             $icon_dir_uri = apply_filters( 'icon_dir_uri', includes_url('images/crystal') );
     4482            $icon_dir = apply_filters( 'icon_dir', ABSPATH . WPINC . '/images/media' );
     4483            $icon_dir_uri = apply_filters( 'icon_dir_uri', includes_url('images/media') );
    44844484            $dirs = apply_filters( 'icon_dirs', array($icon_dir => $icon_dir_uri) );
    44854485            $icon_files = array();

  • trunk/tests/phpunit/tests/media.php

    r27685 r27726  
    150150        $this->assertEquals( '', $prepped['subtype'] );
    151151        $this->assertEquals( '', $prepped['url'] );
    152         $this->assertEquals( site_url( 'wp-includes/images/crystal/default.png' ), $prepped['icon'] );
     152        $this->assertEquals( site_url( 'wp-includes/images/media/default.png' ), $prepped['icon'] );
    153153
    154154        // Fake a mime
Note: See TracChangeset for help on using the changeset viewer.