Changeset 29728

Timestamp:

09/10/2014 09:56:24 PM (10 years ago)

Author:

wonderboymusic

Message:

Don't overwrite the length property unnecessarily when generating metadata for audio and video files.

Props jrf, wonderboymusic.
Fixes #29176.

File:

• trunk/src/wp-admin/includes/media.php (modified) (3 diffs)

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

@@ -2861 +2861 @@
         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.
@@ -2923 +2923 @@
         $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'];
@@ -2979 +2979 @@
         $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'];