Ticket #29176: 29176.diff

src/wp-admin/includes/media.php

@@ -2860 +2860 @@
         foreach ( array( 'id3v2', 'id3v1' ) as $version ) {
                 if ( ! empty( $data[$version]['comments'] ) ) {
                         foreach ( $data[$version]['comments'] as $key => $list ) {
-                                if ( ! empty( $list ) ) {
+                                if ( 'length' !== $key && ! empty( $list ) ) {
                                         $metadata[$key] = reset( $list );
                                         // Fix bug in byte stream analysis.
                                         if ( 'terms_of_use' === $key && 0 === strpos( $metadata[$key], 'yright notice.' ) )
@@ -2922 +2922 @@
         if ( ! empty( $data['mime_type'] ) )
                 $metadata['mime_type'] = $data['mime_type'];
         if ( ! empty( $data['playtime_seconds'] ) )
-                $metadata['length'] = (int) ceil( $data['playtime_seconds'] );
+                $metadata['length'] = (int) round( $data['playtime_seconds'] );
         if ( ! empty( $data['playtime_string'] ) )
                 $metadata['length_formatted'] = $data['playtime_string'];
         if ( ! empty( $data['video']['resolution_x'] ) )
@@ -2978 +2978 @@
         if ( ! empty( $data['mime_type'] ) )
                 $metadata['mime_type'] = $data['mime_type'];
         if ( ! empty( $data['playtime_seconds'] ) )
-                $metadata['length'] = (int) ceil( $data['playtime_seconds'] );
+                $metadata['length'] = (int) round( $data['playtime_seconds'] );
         if ( ! empty( $data['playtime_string'] ) )
                 $metadata['length_formatted'] = $data['playtime_string'];