sergiotarxz
/
Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

see #27574.


git-svn-id: https://develop.svn.wordpress.org/trunk@27864 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Andrew Nacin 2014-03-30 21:07:04 +00:00
parent 2846655164
commit 877ffc087f
5 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/wp-admin/edit-form-advanced.php
View File

@ -140,7 +140,7 @@ if ( 'attachment' == $post_type ) {
add_meta_box( 'submitdiv', __('Save'), 'attachment_submit_meta_box', null, 'side', 'core' ); add_meta_box( 'submitdiv', __('Save'), 'attachment_submit_meta_box', null, 'side', 'core' );
add_action( 'edit_form_after_title', 'edit_form_image_editor' ); 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' ); add_meta_box( 'attachment-id3', __( 'Metadata' ), 'attachment_id3_data_meta_box', null, 'normal', 'core' );
} }
} else { } else {

6
src/wp-admin/includes/media.php
View File

@ -2662,7 +2662,7 @@ function edit_form_image_editor( $post ) {
<div class="wp_attachment_details edit-form-section"> <div class="wp_attachment_details edit-form-section">
<p> <p>
<label for="attachment_caption"><strong><?php _e( 'Caption' ); ?></strong><?php <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." ); _e( "Custom label for item in a playlist. If empty, the file's available data is used." );
endif ?></label><br /> endif ?></label><br />
<textarea class="widefat" name="excerpt" id="attachment_caption"><?php echo $post->post_excerpt; ?></textarea> <textarea class="widefat" name="excerpt" id="attachment_caption"><?php echo $post->post_excerpt; ?></textarea>
@ -2688,7 +2688,7 @@ function edit_form_image_editor( $post ) {
?> ?>
<label for="content"><strong><?php _e( 'Description' ); ?></strong><?php <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.' ); _e( 'Displayed on attachment pages.' );
endif ?></label> endif ?></label>
<?php wp_editor( $post->post_content, 'attachment_content', $editor_args ); ?> <?php wp_editor( $post->post_content, 'attachment_content', $editor_args ); ?>
@ -2751,7 +2751,7 @@ function attachment_submitbox_metadata() {
<?php <?php
endif; endif;
if ( preg_match( '#^(audio|video)#', $post->post_mime_type ) ): if ( preg_match( '#^(audio|video)/#', $post->post_mime_type ) ):
/** /**
* Filter the audio and video metadata fields to be shown in the publish meta box. * Filter the audio and video metadata fields to be shown in the publish meta box.

2
src/wp-admin/includes/meta-boxes.php
View File

@ -1071,7 +1071,7 @@ function attachment_id3_data_meta_box( $post ) {
$meta = wp_get_attachment_metadata( $post->ID ); $meta = wp_get_attachment_metadata( $post->ID );
} }
foreach ( wp_get_relevant_id3_keys() as $key => $label ): ?> foreach ( wp_get_relevant_id3_keys( $post ) as $key => $label ): ?>
<p> <p>
<label for="title"><?php echo $label ?></label> <label for="title"><?php echo $label ?></label>
<input type="text" name="id3_<?php echo esc_attr( $key ) ?>" id="id3_<?php echo esc_attr( $key ) ?>" class="widefat" value="<?php <input type="text" name="id3_<?php echo esc_attr( $key ) ?>" id="id3_<?php echo esc_attr( $key ) ?>" class="widefat" value="<?php

10
src/wp-admin/includes/post.php
View File

@ -237,19 +237,15 @@ function edit_post( $post_data = null ) {
} }
} }
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 ); $id3data = wp_get_attachment_metadata( $post_ID );
if ( ! is_array( $id3data ) ) { if ( ! is_array( $id3data ) ) {
$id3data = array(); $id3data = array();
} }
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 ( isset( $post_data[ 'id3_' . $key ] ) ) {
if ( current_user_can( 'unfiltered_html' ) ) { $id3data[ $key ] = sanitize_post_field( wp_unslash( $post_data[ 'id3_' . $key ] ) );
$id3data[ $key ] = wp_unslash( $post_data[ 'id3_' . $key ] );
} else {
$id3data[ $key ] = wp_unslash( wp_kses_post( $post_data[ 'id3_' . $key ] ) );
}
} }
} }
wp_update_attachment_metadata( $post_ID, $id3data ); wp_update_attachment_metadata( $post_ID, $id3data );

25
src/wp-includes/media.php
View File

@ -1016,25 +1016,25 @@ function wp_underscore_playlist_templates() {
?> ?>
<script type="text/html" id="tmpl-wp-playlist-current-item"> <script type="text/html" id="tmpl-wp-playlist-current-item">
<# if ( data.image ) { #> <# if ( data.image ) { #>
<img src="{{{ data.thumb.src }}}"/> <img src="{{ data.thumb.src }}"/>
<# } #> <# } #>
<div class="wp-playlist-caption"> <div class="wp-playlist-caption">
<span class="wp-caption-meta wp-caption-title">&#8220;{{{ data.title }}}&#8221;</span> <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.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.artist ) { #><span class="wp-caption-meta wp-caption-artist">{{ data.meta.artist }}</span><# } #>
</div> </div>
</script> </script>
<script type="text/html" id="tmpl-wp-playlist-item"> <script type="text/html" id="tmpl-wp-playlist-item">
<div class="wp-playlist-item"> <div class="wp-playlist-item">
<div class="wp-playlist-caption"> <div class="wp-playlist-caption">
{{{ data.index ? ( data.index + '.&nbsp;' ) : '' }}} {{ data.index ? ( data.index + '. ' ) : '' }}
<# if ( data.caption ) { #> <# if ( data.caption ) { #>
{{{ data.caption }}} {{{ data.caption }}}
<# } else { #> <# } else { #>
<span class="wp-caption-title">&#8220;{{{ data.title }}}&#8221;</span> <span class="wp-caption-title">&#8220;{{{ data.title }}}&#8221;</span>
<# if ( data.artists && data.meta.artist ) { #> <# if ( data.artists && data.meta.artist ) { #>
<span class="wp-caption-by"><?php _e( 'by' ) ?></span> <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>
<# } #> <# } #>
<# } #> <# } #>
</div> </div>
@ -1203,7 +1203,7 @@ function wp_playlist_shortcode( $attr ) {
$meta = wp_get_attachment_metadata( $attachment->ID ); $meta = wp_get_attachment_metadata( $attachment->ID );
if ( ! empty( $meta ) ) { 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 ] ) ) { if ( ! empty( $meta[ $key ] ) ) {
$track['meta'][ $key ] = $meta[ $key ]; $track['meta'][ $key ] = $meta[ $key ];
} }
@ -1317,9 +1317,10 @@ function wp_get_audio_extensions() {
* *
* @since 3.9.0 * @since 3.9.0
* *
* @param WP_Post $post The post in question, provided for context.
* @return array * @return array
*/ */
function wp_get_relevant_id3_keys() { function wp_get_relevant_id3_keys( $post ) {
$fields = array( $fields = array(
'artist' => __( 'Artist' ), 'artist' => __( 'Artist' ),
'album' => __( 'Album' ), 'album' => __( 'Album' ),
@ -1327,14 +1328,16 @@ function wp_get_relevant_id3_keys() {
'year' => __( 'Year' ), 'year' => __( 'Year' ),
'length_formatted' => __( 'Formatted Length' ) '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 * @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 );
} }
/** /**
* The Audio shortcode. * The Audio shortcode.
@ -2331,7 +2334,7 @@ function wp_prepare_attachment_for_js( $attachment ) {
$response['fileLength'] = $meta['length_formatted']; $response['fileLength'] = $meta['length_formatted'];
$response['meta'] = array(); $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 ] ) ) { if ( ! empty( $meta[ $key ] ) ) {
$response['meta'][ $key ] = $meta[ $key ]; $response['meta'][ $key ] = $meta[ $key ];
} }