Changeset 27864

Timestamp:

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

Author:

nacin

Message:

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

see #27574.

Location:

trunk/src

Files:

• wp-admin/edit-form-advanced.php (modified) (1 diff)
• wp-admin/includes/media.php (modified) (3 diffs)
• wp-admin/includes/meta-boxes.php (modified) (1 diff)
• wp-admin/includes/post.php (modified) (2 diffs)
• wp-includes/media.php (modified) (7 diffs)

trunk/src/wp-admin/edit-form-advanced.php

@@ -141 +141 @@
     add_action( 'edit_form_after_title', 'edit_form_image_editor' );
 
-    if ( preg_match( '#^audio#', $post->post_mime_type ) ) {
+    if ( 0 === strpos( $post->post_mime_type, 'audio/' ) ) {
         add_meta_box( 'attachment-id3', __( 'Metadata' ), 'attachment_id3_data_meta_box', null, 'normal', 'core' );
     }

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

@@ -2663 +2663 @@
         <p>
             <label for="attachment_caption"><strong><?php _e( 'Caption' ); ?></strong><?php
-            if ( preg_match( '#^audio|video#', $post->post_mime_type ) ): ?>: <?php
+            if ( preg_match( '#^(audio|video)/#', $post->post_mime_type ) ): ?>: <?php
                 _e( "Custom label for item in a playlist. If empty, the file's available data is used." );
             endif ?></label><br />
@@ -2689 +2689 @@
 
     <label for="content"><strong><?php _e( 'Description' ); ?></strong><?php
-    if ( preg_match( '#^audio|video#', $post->post_mime_type ) ): ?>: <?php
+    if ( preg_match( '#^(audio|video)/#', $post->post_mime_type ) ): ?>: <?php
         _e( 'Displayed on attachment pages.' );
     endif ?></label>
@@ -2752 +2752 @@
         endif;
 
-    if ( preg_match( '#^(audio|video)#', $post->post_mime_type ) ):
+    if ( preg_match( '#^(audio|video)/#', $post->post_mime_type ) ):
 
         /**

trunk/src/wp-admin/includes/meta-boxes.php

@@ -1072 +1072 @@
     }
 
-    foreach ( wp_get_relevant_id3_keys() as $key => $label ): ?>
+    foreach ( wp_get_relevant_id3_keys( $post ) as $key => $label ): ?>
     <p>
         <label for="title"><?php echo $label ?></label>

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

@@ -238 +238 @@
     }
 
-    if ( 'attachment' === $post_data['post_type'] && preg_match( '#^audio|video#', $post_data['post_mime_type'] ) ) {
+    if ( 'attachment' === $post_data['post_type'] && preg_match( '#^(audio|video)/#', $post_data['post_mime_type'] ) ) {
         $id3data = wp_get_attachment_metadata( $post_ID );
         if ( ! is_array( $id3data ) ) {
@@ -244 +244 @@
         }
 
-        foreach ( wp_get_relevant_id3_keys() as $key => $label ) {
+        foreach ( wp_get_relevant_id3_keys( $post ) as $key => $label ) {
             if ( isset( $post_data[ 'id3_' . $key ] ) ) {
-                if ( current_user_can( 'unfiltered_html' ) ) {
-                    $id3data[ $key ] = wp_unslash( $post_data[ 'id3_' . $key ] );
-                } else {
-                    $id3data[ $key ] = wp_unslash( wp_kses_post( $post_data[ 'id3_' . $key ] ) );
-                }
+                $id3data[ $key ] = sanitize_post_field( wp_unslash( $post_data[ 'id3_' . $key ] ) );
             }
         }

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 ];