Changeset 27864 for trunk/src/wp-includes/media.php

Timestamp:

03/30/2014 09:07:04 PM (11 years ago)

Author:

nacin

Message:

Cleanups for audio/video metadata, see [27862].

see #27574.

File:

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

trunk/src/wp-includes/media.php

@@ -1017 +1017 @@
 <script type="text/html" id="tmpl-wp-playlist-current-item">
     <# if ( data.image ) { #>
-    <img src="{{{ data.thumb.src }}}"/>
+    <img src="{{ data.thumb.src }}"/>
     <# } #>
     <div class="wp-playlist-caption">
         <span class="wp-caption-meta wp-caption-title">&#8220;{{{ data.title }}}&#8221;</span>
-        <# if ( data.meta.album ) { #><span class="wp-caption-meta wp-caption-album">{{{ data.meta.album }}}</span><# } #>
-        <# if ( data.meta.artist ) { #><span class="wp-caption-meta wp-caption-artist">{{{ data.meta.artist }}}</span><# } #>
+        <# if ( data.meta.album ) { #><span class="wp-caption-meta wp-caption-album">{{ data.meta.album }}</span><# } #>
+        <# if ( data.meta.artist ) { #><span class="wp-caption-meta wp-caption-artist">{{ data.meta.artist }}</span><# } #>
     </div>
 </script>
@@ -1028 +1028 @@
     <div class="wp-playlist-item">
         <div class="wp-playlist-caption">
-            {{{ data.index ? ( data.index + '.&nbsp;' ) : '' }}}
+            {{ data.index ? ( data.index + '. ' ) : '' }}
             <# if ( data.caption ) { #>
                 {{{ data.caption }}}
@@ -1035 +1035 @@
                 <# if ( data.artists && data.meta.artist ) { #>
                 <span class="wp-caption-by"><?php _e( 'by' ) ?></span>
-                <span class="wp-caption-artist">{{{ data.meta.artist }}}</span>
+                <span class="wp-caption-artist">{{ data.meta.artist }}</span>
                 <# } #>
             <# } #>
@@ -1204 +1204 @@
         if ( ! empty( $meta ) ) {
 
-            foreach ( wp_get_relevant_id3_keys() as $key => $label ) {
+            foreach ( wp_get_relevant_id3_keys( $attachment ) as $key => $label ) {
                 if ( ! empty( $meta[ $key ] ) ) {
                     $track['meta'][ $key ] = $meta[ $key ];
@@ -1318 +1318 @@
  * @since 3.9.0
  *
+ * @param WP_Post $post The post in question, provided for context.
  * @return array
  */
-function wp_get_relevant_id3_keys() {
+function wp_get_relevant_id3_keys( $post ) {
     $fields = array(
         'artist' => __( 'Artist' ),
@@ -1328 +1329 @@
         'length_formatted' => __( 'Formatted Length' )
     );
+
     /**
-     * Filter the editable list of keys to lookup data from an attachment's metadata
+     * Filter the editable list of keys to lookup data from an attachment's metadata.
      *
      * @since 3.9.0
      *
-     * @param array $fields
+     * @param array   $fields Key/value pairs of field keys to labels.
+     * @param WP_Post $post   Post object.
      */
-    return apply_filters( 'wp_get_relevant_id3_keys', $fields );
+    return apply_filters( 'wp_get_relevant_id3_keys', $fields, $post );
 }
 /**
@@ -2332 +2335 @@
 
         $response['meta'] = array();
-        foreach ( wp_get_relevant_id3_keys() as $key => $label ) {
+        foreach ( wp_get_relevant_id3_keys( $attachment ) as $key => $label ) {
             if ( ! empty( $meta[ $key ] ) ) {
                 $response['meta'][ $key ] = $meta[ $key ];