- +

@@ -1829,6 +2173,10 @@ jQuery(document).ready( function($) { * * @since 2.5.0 * + * @global string $redir_tab + * @global string $type + * @global string $tab + * * @param array $errors */ function media_upload_gallery_form($errors) { @@ -1839,7 +2187,8 @@ function media_upload_gallery_form($errors) { $post_id = intval($_REQUEST['post_id']); $form_action_url = admin_url("media-upload.php?type=$type&tab=gallery&post_id=$post_id"); - $form_action_url = apply_filters('media_upload_form_url', $form_action_url, $type); + /** This filter is documented in wp-admin/includes/media.php */ + $form_action_url = apply_filters( 'media_upload_form_url', $form_action_url, $type ); $form_class = 'media-upload-form validate'; if ( get_user_setting('uploader') ) @@ -1847,7 +2196,6 @@ function media_upload_gallery_form($errors) { ?>

@@ -1871,7 +2218,7 @@ jQuery(function($){

- +

@@ -1971,10 +2318,17 @@ jQuery(function($){ } /** - * {@internal Missing Short Description}} + * Outputs the legacy media upload form for the media library. * * @since 2.5.0 * + * @global wpdb $wpdb + * @global WP_Query $wp_query + * @global WP_Locale $wp_locale + * @global string $type + * @global string $tab + * @global array $post_mime_types + * * @param array $errors */ function media_upload_library_form($errors) { @@ -1985,25 +2339,29 @@ function media_upload_library_form($errors) { $post_id = isset( $_REQUEST['post_id'] ) ? intval( $_REQUEST['post_id'] ) : 0; $form_action_url = admin_url("media-upload.php?type=$type&tab=library&post_id=$post_id"); - $form_action_url = apply_filters('media_upload_form_url', $form_action_url, $type); + /** This filter is documented in wp-admin/includes/media.php */ + $form_action_url = apply_filters( 'media_upload_form_url', $form_action_url, $type ); $form_class = 'media-upload-form validate'; if ( get_user_setting('uploader') ) $form_class .= ' html-uploader'; - $_GET['paged'] = isset( $_GET['paged'] ) ? intval($_GET['paged']) : 0; - if ( $_GET['paged'] < 1 ) - $_GET['paged'] = 1; - $start = ( $_GET['paged'] - 1 ) * 10; - if ( $start < 1 ) - $start = 0; - add_filter( 'post_limits', create_function( '$a', "return 'LIMIT $start, 10';" ) ); + $q = $_GET; + $q['posts_per_page'] = 10; + $q['paged'] = isset( $q['paged'] ) ? intval( $q['paged'] ) : 0; + if ( $q['paged'] < 1 ) { + $q['paged'] = 1; + } + $q['offset'] = ( $q['paged'] - 1 ) * 10; + if ( $q['offset'] < 1 ) { + $q['offset'] = 0; + } - list($post_mime_types, $avail_post_mime_types) = wp_edit_attachments_query(); + list($post_mime_types, $avail_post_mime_types) = wp_edit_attachments_query( $q ); ?> - + @@ -2036,7 +2394,7 @@ if ( empty($_GET['post_mime_type']) || $_GET['post_mime_type'] == 'all' ) $class = ' class="current"'; else $class = ''; -$type_links[] = "

'all', 'paged'=>false, 'm'=>false))) . "'$class>".__('All Types').""; +$type_links[] = '

' . __('All Types') . ''; foreach ( $post_mime_types as $mime_type => $label ) { $class = ''; @@ -2046,8 +2404,17 @@ foreach ( $post_mime_types as $mime_type => $label ) { if ( isset($_GET['post_mime_type']) && wp_match_mime_types($mime_type, $_GET['post_mime_type']) ) $class = ' class="current"'; - $type_links[] = "

$mime_type, 'paged'=>false))) . "'$class>" . sprintf( translate_nooped_plural( $label[2], $num_posts[$mime_type] ), "" . number_format_i18n( $num_posts[$mime_type] ) . '') . ''; + $type_links[] = '

' . sprintf( translate_nooped_plural( $label[2], $num_posts[$mime_type] ), '' . number_format_i18n( $num_posts[$mime_type] ) . '') . ''; } +/** + * Filter the media upload mime type list items. + * + * Returned values should begin with an `

` tag. + * + * @since 3.1.0 + * + * @param array $type_links An array of list items containing mime type link HTML. + */ echo implode(' |

', apply_filters( 'media_upload_mime_type_links', $type_links ) ) . ''; unset($type_links); ?> @@ -2062,7 +2429,7 @@ $page_links = paginate_links( array( 'prev_text' => __('«'), 'next_text' => __('»'), 'total' => ceil($wp_query->found_posts / 10), - 'current' => $_GET['paged'] + 'current' => $q['paged'], )); if ( $page_links ) @@ -2077,17 +2444,18 @@ $arc_query = "SELECT DISTINCT YEAR(post_date) AS yyear, MONTH(post_date) AS mmon $arc_result = $wpdb->get_results( $arc_query ); $month_count = count($arc_result); +$selected_month = isset( $_GET['m'] ) ? $_GET['m'] : 0; if ( $month_count && !( 1 == $month_count && 0 == $arc_result[0]->mmonth ) ) { ?> - @@ -2174,7 +2543,7 @@ function wp_media_insert_url_form( $default_view = 'image' ) {

' . __( 'Image' ) . ' ' . __( 'Audio, Video, or Other File' ) . '


+	' . __('Image Caption') . '

- @@ -2182,7 +2551,7 @@ function wp_media_insert_url_form( $default_view = 'image' ) { - @@ -2192,7 +2561,7 @@ function wp_media_insert_url_form( $default_view = 'image' ) { - ' . $caption . ' - + -

+	' . __('URL') . ' *
+	' . __('Title') . ' *
	' . __('Link text, e.g. “Ransom Demands (PDF)”') . '
+	' . __('Alternative Text') . '	@@ -2200,7 +2569,7 @@ function wp_media_insert_url_form( $default_view = 'image' ) {
' . __('Alignment') . '	' . __('Alignment') . '	' . __('None') . ' @@ -2214,7 +2583,7 @@ function wp_media_insert_url_form( $default_view = 'image' ) {
+	' . __('Link Image To:') . '	@@ -2244,6 +2613,8 @@ function wp_media_insert_url_form( $default_view = 'image' ) { * Displays the multi-file uploader message. * * @since 2.6.0 + * + * @global int $post_ID / function media_upload_flash_bypass() { $browser_uploader = admin_url( 'media-new.php?browser-uploader' ); @@ -2259,7 +2630,6 @@ function media_upload_flash_bypass() { - Switch to the multi-file uploader.'); ?> + Switch to the multi-file uploader.'); ?> ID ) ) $thumb_url = wp_get_attachment_image_src( $attachment_id, array( 900, 450 ), true ); - $filename = esc_html( basename( $post->guid ) ); - $title = esc_attr( $post->post_title ); $alt_text = get_post_meta( $post->ID, '_wp_attachment_image_alt', true ); $att_url = wp_get_attachment_url( $post->ID ); ?> @@ -2342,7 +2709,7 @@ function edit_form_image_editor( $post ) { $nonce = wp_create_nonce( "image_editor-$post->ID" ); $image_edit_button = " "; } - ?> + ?> @@ -2354,27 +2721,33 @@ function edit_form_image_editor( $post ) { post_mime_type, 'audio/' ) ): + elseif ( $attachment_id && wp_attachment_is( 'audio', $post ) ): + + wp_maybe_generate_attachment_metadata( $post ); echo wp_audio_shortcode( array( 'src' => $att_url ) ); - elseif ( $attachment_id && 0 === strpos( $post->post_mime_type, 'video/' ) ): + elseif ( $attachment_id && wp_attachment_is( 'video', $post ) ): + + wp_maybe_generate_attachment_metadata( $post ); $meta = wp_get_attachment_metadata( $attachment_id ); - $w = ! empty( $meta['width'] ) ? min( $meta['width'], 600 ) : 0; - $h = 0; - if ( ! empty( $meta['height'] ) ) - $h = $meta['height']; - if ( $h && $w < $meta['width'] ) + $w = ! empty( $meta['width'] ) ? min( $meta['width'], 640 ) : 0; + $h = ! empty( $meta['height'] ) ? $meta['height'] : 0; + if ( $h && $w < $meta['width'] ) { $h = round( ( $meta['height'] $w ) / $meta['width'] ); + } $attr = array( 'src' => $att_url ); - - if ( ! empty( $meta['width' ] ) ) + if ( ! empty( $w ) && ! empty( $h ) ) { $attr['width'] = $w; - - if ( ! empty( $meta['height'] ) ) $attr['height'] = $h; + } + + $thumb_id = get_post_thumbnail_id( $attachment_id ); + if ( ! empty( $thumb_id ) ) { + $attr['poster'] = wp_get_attachment_url( $thumb_id ); + } echo wp_video_shortcode( $attr ); @@ -2386,6 +2759,7 @@ function edit_form_image_editor( $post ) { <?php echo $post->post_excerpt; ?> + post_mime_type, 0, 5 ) ) : ?> @@ -2404,7 +2778,10 @@ function edit_form_image_editor( $post ) { ); ?> - + post_mime_type ) ) { + echo ': ' . __( 'Displayed on attachment pages.' ); + } ?> post_content, 'attachment_content', $editor_args ); ?> @@ -2422,103 +2799,132 @@ function edit_form_image_editor( $post ) { function attachment_submitbox_metadata() { $post = get_post(); - $filename = esc_html( wp_basename( $post->guid ) ); + $file = get_attached_file( $post->ID ); + $filename = esc_html( wp_basename( $file ) ); $media_dims = ''; $meta = wp_get_attachment_metadata( $post->ID ); if ( isset( $meta['width'], $meta['height'] ) ) $media_dims .= "{$meta['width']} × {$meta['height']} "; + /** This filter is documented in wp-admin/includes/media.php / $media_dims = apply_filters( 'media_meta', $media_dims, $post ); $att_url = wp_get_attachment_url( $post->ID ); ?> - - - + + + - + - + ID ), $matches ) ) + if ( preg_match( '/^.?\.(\w+)$/', get_attached_file( $post->ID ), $matches ) ) { echo esc_html( strtoupper( $matches[1] ) ); - else + list( $mime_type ) = explode( '/', $post->post_mime_type ); + if ( $mime_type !== 'image' && ! empty( $meta['mime_type'] ) ) { + if ( $meta['mime_type'] !== "$mime_type/" . strtolower( $matches[1] ) ) { + echo ' (' . $meta['mime_type'] . ')'; + } + } + } else { echo strtoupper( str_replace( 'image/', '', $post->post_mime_type ) ); + } ?> -post_mime_type ) ): - - $fields = array( - 'mime_type' => __( 'Mime-type:' ), - 'year' => __( 'Year:' ), - 'genre' => __( 'Genre:' ), - 'length_formatted' => __( 'Length:' ), - ); - - foreach ( $fields as $key => $label ): - if ( ! empty( $meta[$key] ) ) : ?> - - - - - + + + + post_mime_type ) ) { + + /** + * Filter the audio and video metadata fields to be shown in the publish meta box. + * + * The key for each item in the array should correspond to an attachment + * metadata key, and the value should be the desired label. + * + * @since 3.7.0 + * + * @param array $fields An array of the attachment metadata keys and labels. + / + $fields = apply_filters( 'media_submitbox_misc_sections', array( + 'length_formatted' => __( 'Length:' ), + 'bitrate' => __( 'Bitrate:' ), + ) ); + foreach ( $fields as $key => $label ) { + if ( empty( $meta[ $key ] ) ) { + continue; + } + ?> + + __( 'Audio Format:' ), - 'codec' => __( 'Audio Codec:' ) - ); + 'codec' => __( 'Audio Codec:' ) + ) ); - foreach ( $audio_fields as $key => $label ): - if ( ! empty( $meta['audio'][$key] ) ) : ?> - + foreach ( $audio_fields as $key => $label ) { + if ( empty( $meta['audio'][ $key ] ) ) { + continue; + } + ?> + - + $list ) { - if ( ! empty( $list ) ) { + if ( 'length' !== $key && ! empty( $list ) ) { $metadata[$key] = reset( $list ); - // fix bug in byte stream analysis + // Fix bug in byte stream analysis. if ( 'terms_of_use' === $key && 0 === strpos( $metadata[$key], 'yright notice.' ) ) $metadata[$key] = 'Cop' . $metadata[$key]; } @@ -2569,16 +2975,22 @@ function wp_add_id3_tag_data( &$metadata, $data ) { @since 3.6.0 * * @param string $file Path to file. - * @return array\|boolean Returns array of metadata, if found. + * @return array\|bool Returns array of metadata, if found. / function wp_read_video_metadata( $file ) { - if ( ! file_exists( $file ) ) + if ( ! file_exists( $file ) ) { return false; + } $metadata = array(); - if ( ! class_exists( 'getID3' ) ) + if ( ! defined( 'GETID3_TEMP_DIR' ) ) { + define( 'GETID3_TEMP_DIR', get_temp_dir() ); + } + + if ( ! class_exists( 'getID3', false ) ) { require( ABSPATH . WPINC . '/ID3/getid3.php' ); + } $id3 = new getID3(); $data = $id3->analyze( $file ); @@ -2593,7 +3005,7 @@ function wp_read_video_metadata( $file ) { 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'] ) ) @@ -2625,15 +3037,21 @@ function wp_read_video_metadata( $file ) { @since 3.6.0 * * @param string $file Path to file. - * @return array\|boolean Returns array of metadata, if found. + * @return array\|bool Returns array of metadata, if found. / function wp_read_audio_metadata( $file ) { - if ( ! file_exists( $file ) ) + if ( ! file_exists( $file ) ) { return false; + } $metadata = array(); - if ( ! class_exists( 'getID3' ) ) + if ( ! defined( 'GETID3_TEMP_DIR' ) ) { + define( 'GETID3_TEMP_DIR', get_temp_dir() ); + } + + if ( ! class_exists( 'getID3', false ) ) { require( ABSPATH . WPINC . '/ID3/getid3.php' ); + } $id3 = new getID3(); $data = $id3->analyze( $file ); @@ -2649,7 +3067,7 @@ function wp_read_audio_metadata( $file ) { 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']; @@ -2657,3 +3075,63 @@ function wp_read_audio_metadata( $file ) { return $metadata; } + +/* + * Encapsulate logic for Attach/Detach actions + * + * @since 4.2.0 + * + * @global wpdb $wpdb WordPress database abstraction object. + * + * @param int $parent_id Attachment parent ID. + * @param string $action Optional. Attach/detach action. Accepts 'attach' or 'detach'. + * Default 'attach'. + */ +function wp_media_attach_action( $parent_id, $action = 'attach' ) { + global $wpdb; + + if ( ! $parent_id ) { + return; + } + + if ( ! current_user_can( 'edit_post', $parent_id ) ) { + wp_die( __( 'You are not allowed to edit this post.' ) ); + } + $ids = array(); + foreach ( (array) $_REQUEST['media'] as $att_id ) { + $att_id = (int) $att_id; + + if ( ! current_user_can( 'edit_post', $att_id ) ) { + continue; + } + + $ids[] = $att_id; + } + + if ( ! empty( $ids ) ) { + $ids_string = implode( ',', $ids ); + if ( 'attach' === $action ) { + $result = $wpdb->query( $wpdb->prepare( "UPDATE $wpdb->posts SET post_parent = %d WHERE post_type = 'attachment' AND ID IN ( $ids_string )", $parent_id ) ); + } else { + $result = $wpdb->query( "UPDATE $wpdb->posts SET post_parent = 0 WHERE post_type = 'attachment' AND ID IN ( $ids_string )" ); + } + + foreach ( $ids as $att_id ) { + clean_attachment_cache( $att_id ); + } + } + + if ( isset( $result ) ) { + $location = 'upload.php'; + if ( $referer = wp_get_referer() ) { + if ( false !== strpos( $referer, 'upload.php' ) ) { + $location = remove_query_arg( array( 'attached', 'detach' ), $referer ); + } + } + + $key = 'attach' === $action ? 'attached' : 'detach'; + $location = add_query_arg( array( $key => $result ), $location ); + wp_redirect( $location ); + exit; + } +}