Ticket #25170: 25170.4.patch

wp-admin/includes/media.php

@@ -2441 +2441 @@
         <div class="misc-pub-section misc-pub-filename">
                 <?php _e( 'File name:' ); ?> <strong><?php echo $filename; ?></strong>
         </div>
-        <div class="misc-pub-section misc-pub-filetype">
-                <?php _e( 'File type:' ); ?> <strong><?php
-                        if ( preg_match( '/^.*?\.(\w+)$/', get_attached_file( $post->ID ), $matches ) )
-                                echo esc_html( strtoupper( $matches[1] ) );
-                        else
-                                echo strtoupper( str_replace( 'image/', '', $post->post_mime_type ) );
-                ?></strong>
-        </div>
 
-<?php
+        <?php if ( preg_match( '/^.*?\.(\w+)$/', get_attached_file( $post->ID ), $matches ) ) : ?>
+                <div class="misc-pub-section misc-pub-filetype">
+                        <?php _e( 'File type:' ); ?> <strong><?php echo esc_html( strtoupper( $matches[1] ) ); ?></strong>
+                </div>
+        <?php endif; ?>
+
+        <?php
+                if ( isset( $meta['filesize'] ) )
+                        $file_size = $meta['filesize'];
+                else
+                        $file_size = filesize( get_attached_file( $post->ID ) );
+
+                if ( ! empty( $file_size ) ) : ?>
+                        <div class="misc-pub-section misc-pub-filesize">
+                                <?php _e( 'File size:' ); ?> <strong><?php echo size_format( $file_size ); ?></strong>
+                        </div>
+                        <?php
+                endif;
+
         if ( preg_match( '#^audio|video#', $post->post_mime_type ) ):
 
                 /**
@@ -2471 +2481 @@
                  * }
                  */
                 $fields = apply_filters( 'media_submitbox_misc_sections', array(
-                        'mime_type'        => __( 'Mime-type:' ),
                         'year'             => __( 'Year:' ),
                         'genre'            => __( 'Genre:' ),
                         'length_formatted' => __( 'Length:' ),
@@ -2516 +2525 @@
                  */
                 $audio_fields = apply_filters( 'audio_submitbox_misc_sections', array(
                         'dataformat' => __( 'Audio Format:' ),
-                        'codec'      => __( 'Audio Codec:' )
                 ) );
 
                 foreach ( $audio_fields as $key => $label ):
-                        if ( ! empty( $meta['audio'][$key] ) ) : ?>
+                        if ( ! empty( $meta['audio'][ $key ] ) ) : ?>
                 <div class="misc-pub-section misc-pub-audio misc-pub-<?php echo sanitize_html_class( $key ); ?>">
-                        <?php echo $label; ?> <strong><?php echo esc_html( $meta['audio'][$key] ); ?></strong>
+                        <?php echo $label; ?> <strong><?php echo esc_html( $meta['audio'][ $key ] ); ?></strong>
                 </div>
         <?php
                         endif;