--- a/wp/wp-admin/includes/media.php Tue Jun 09 11:14:17 2015 +0000
+++ b/wp/wp-admin/includes/media.php Mon Oct 14 17:39:30 2019 +0200
@@ -22,7 +22,7 @@
);
/**
- * Filter the available tabs in the legacy (pre-3.5.0) media popup.
+ * Filters the available tabs in the legacy (pre-3.5.0) media popup.
*
* @since 2.5.0
*
@@ -36,6 +36,8 @@
*
* @since 2.5.0
*
+ * @global wpdb $wpdb WordPress database abstraction object.
+ *
* @param array $tabs
* @return array $tabs with gallery if post has image attachment
*/
@@ -61,12 +63,13 @@
return $tabs;
}
-add_filter('media_upload_tabs', 'update_gallery_tab');
/**
- * {@internal Missing Short Description}}
+ * Outputs the legacy media upload tabs UI.
*
* @since 2.5.0
+ *
+ * @global string $redir_tab
*/
function the_media_upload_tabs() {
global $redir_tab;
@@ -99,42 +102,52 @@
}
/**
- * {@internal Missing Short Description}}
+ * Retrieves the image HTML to send to the editor.
*
* @since 2.5.0
*
- * @param integer $id image attachment id
- * @param string $caption image caption
- * @param string $alt image alt attribute
- * @param string $title image title attribute
- * @param string $align image css alignment property
- * @param string $url image src url
- * @param string|bool $rel image rel attribute
- * @param string $size image size (thumbnail, medium, large, full or added with add_image_size() )
- * @return string the html to insert into editor
+ * @param int $id Image attachment id.
+ * @param string $caption Image caption.
+ * @param string $title Image title attribute.
+ * @param string $align Image CSS alignment property.
+ * @param string $url Optional. Image src URL. Default empty.
+ * @param bool|string $rel Optional. Value for rel attribute or whether to add a default value. Default false.
+ * @param string|array $size Optional. Image size. Accepts any valid image size, or an array of width
+ * and height values in pixels (in that order). Default 'medium'.
+ * @param string $alt Optional. Image alt attribute. Default empty.
+ * @return string The HTML output to insert into the editor.
*/
-function get_image_send_to_editor($id, $caption, $title, $align, $url='', $rel = false, $size='medium', $alt = '') {
-
- $html = get_image_tag($id, $alt, '', $align, $size);
-
- $rel = $rel ? ' rel="attachment wp-att-' . esc_attr($id).'"' : '';
+function get_image_send_to_editor( $id, $caption, $title, $align, $url = '', $rel = false, $size = 'medium', $alt = '' ) {
+
+ $html = get_image_tag( $id, $alt, '', $align, $size );
+
+ if ( $rel ) {
+ if ( is_string( $rel ) ) {
+ $rel = ' rel="' . esc_attr( $rel ) . '"';
+ } else {
+ $rel = ' rel="attachment wp-att-' . intval( $id ) . '"';
+ }
+ } else {
+ $rel = '';
+ }
if ( $url )
- $html = '<a href="' . esc_attr($url) . "\"$rel>$html</a>";
+ $html = '<a href="' . esc_attr( $url ) . '"' . $rel . '>' . $html . '</a>';
/**
- * Filter the image HTML markup to send to the editor.
+ * Filters the image HTML markup to send to the editor when inserting an image.
*
* @since 2.5.0
*
- * @param string $html The image HTML markup to send.
- * @param int $id The attachment id.
- * @param string $caption The image caption.
- * @param string $title The image title.
- * @param string $align The image alignment.
- * @param string $url The image source URL.
- * @param string $size The image size.
- * @param string $alt The image alternative, or alt, text.
+ * @param string $html The image HTML markup to send.
+ * @param int $id The attachment id.
+ * @param string $caption The image caption.
+ * @param string $title The image title.
+ * @param string $align The image alignment.
+ * @param string $url The image source URL.
+ * @param string|array $size Size of image. Image size or array of width and height values
+ * (in that order). Default 'medium'.
+ * @param string $alt The image alternative, or alt, text.
*/
$html = apply_filters( 'image_send_to_editor', $html, $id, $caption, $title, $align, $url, $size, $alt );
@@ -149,23 +162,23 @@
* @param string $html
* @param integer $id
* @param string $caption image caption
- * @param string $alt image alt attribute
* @param string $title image title attribute
* @param string $align image css alignment property
* @param string $url image src url
* @param string $size image size (thumbnail, medium, large, full or added with add_image_size() )
+ * @param string $alt image alt attribute
* @return string
*/
function image_add_caption( $html, $id, $caption, $title, $align, $url, $size, $alt = '' ) {
/**
- * Filter the caption text.
+ * Filters the caption text.
*
* Note: If the caption text is empty, the caption shortcode will not be appended
* to the image HTML when inserted into the editor.
*
* Passing an empty value also prevents the {@see 'image_add_caption_shortcode'}
- * filter from being evaluated at the end of {@see image_add_caption()}.
+ * Filters from being evaluated at the end of image_add_caption().
*
* @since 4.1.0
*
@@ -175,7 +188,7 @@
$caption = apply_filters( 'image_add_caption_text', $caption, $id );
/**
- * Filter whether to disable captions.
+ * Filters whether to disable captions.
*
* Prevents image captions from being appended to image HTML when inserted into the editor.
*
@@ -207,7 +220,7 @@
$shcode = '[caption id="' . $id . '" align="align' . $align . '" width="' . $width . '"]' . $html . ' ' . $caption . '[/caption]';
/**
- * Filter the image HTML markup including the caption shortcode.
+ * Filters the image HTML markup including the caption shortcode.
*
* @since 2.6.0
*
@@ -216,7 +229,6 @@
*/
return apply_filters( 'image_add_caption_shortcode', $shcode, $html );
}
-add_filter( 'image_send_to_editor', 'image_add_caption', 20, 8 );
/**
* Private preg_replace callback used in image_add_caption()
@@ -240,7 +252,7 @@
?>
<script type="text/javascript">
var win = window.dialogArguments || opener || parent || top;
-win.send_to_editor('<?php echo addslashes($html); ?>');
+win.send_to_editor( <?php echo wp_json_encode( $html ); ?> );
</script>
<?php
exit;
@@ -251,34 +263,35 @@
*
* @since 2.5.0
*
- * @param string $file_id Index of the {@link $_FILES} array that the file was sent. Required.
+ * @param string $file_id Index of the `$_FILES` array that the file was sent. Required.
* @param int $post_id The post ID of a post to attach the media item to. Required, but can
* be set to 0, creating a media item that has no relationship to a post.
* @param array $post_data Overwrite some of the attachment. Optional.
- * @param array $overrides Override the {@link wp_handle_upload()} behavior. Optional.
+ * @param array $overrides Override the wp_handle_upload() behavior. Optional.
* @return int|WP_Error ID of the attachment or a WP_Error object on failure.
*/
function media_handle_upload($file_id, $post_id, $post_data = array(), $overrides = array( 'test_form' => false )) {
$time = current_time('mysql');
if ( $post = get_post($post_id) ) {
- if ( substr( $post->post_date, 0, 4 ) > 0 )
+ // The post date doesn't usually matter for pages, so don't backdate this upload.
+ if ( 'page' !== $post->post_type && substr( $post->post_date, 0, 4 ) > 0 )
$time = $post->post_date;
}
- $name = $_FILES[$file_id]['name'];
$file = wp_handle_upload($_FILES[$file_id], $overrides, $time);
if ( isset($file['error']) )
return new WP_Error( 'upload_error', $file['error'] );
- $name_parts = pathinfo($name);
- $name = trim( substr( $name, 0, -(1 + strlen($name_parts['extension'])) ) );
+ $name = $_FILES[$file_id]['name'];
+ $ext = pathinfo( $name, PATHINFO_EXTENSION );
+ $name = wp_basename( $name, ".$ext" );
$url = $file['url'];
$type = $file['type'];
$file = $file['file'];
- $title = $name;
+ $title = sanitize_text_field( $name );
$content = '';
$excerpt = '';
@@ -301,6 +314,7 @@
/* translators: 1: audio track title, 2: artist name */
$content .= sprintf( __( '"%1$s" by %2$s.' ), $title, $meta['artist'] );
} else {
+ /* translators: 1: audio track title */
$content .= sprintf( __( '"%s".' ), $title );
}
@@ -319,22 +333,29 @@
}
- if ( ! empty( $meta['year'] ) )
+ if ( ! empty( $meta['year'] ) ) {
+ /* translators: Audio file track information. 1: Year of audio track release */
$content .= ' ' . sprintf( __( 'Released: %d.' ), $meta['year'] );
+ }
if ( ! empty( $meta['track_number'] ) ) {
$track_number = explode( '/', $meta['track_number'] );
- if ( isset( $track_number[1] ) )
+ if ( isset( $track_number[1] ) ) {
+ /* translators: Audio file track information. 1: Audio track number, 2: Total audio tracks */
$content .= ' ' . sprintf( __( 'Track %1$s of %2$s.' ), number_format_i18n( $track_number[0] ), number_format_i18n( $track_number[1] ) );
- else
+ } else {
+ /* translators: Audio file track information. 1: Audio track number */
$content .= ' ' . sprintf( __( 'Track %1$s.' ), number_format_i18n( $track_number[0] ) );
+ }
}
- if ( ! empty( $meta['genre'] ) )
+ if ( ! empty( $meta['genre'] ) ) {
+ /* translators: Audio file genre information. 1: Audio genre name */
$content .= ' ' . sprintf( __( 'Genre: %s.' ), $meta['genre'] );
+ }
// Use image exif/iptc data for title and caption defaults if possible.
- } elseif ( 0 === strpos( $type, 'image/' ) && $image_meta = @wp_read_image_metadata( $file ) ) {
+ } elseif ( 0 === strpos( $type, 'image/' ) && $image_meta = wp_read_image_metadata( $file ) ) {
if ( trim( $image_meta['title'] ) && ! is_numeric( sanitize_title( $image_meta['title'] ) ) ) {
$title = $image_meta['title'];
}
@@ -355,11 +376,10 @@
), $post_data );
// This should never be set as it would then overwrite an existing attachment.
- if ( isset( $attachment['ID'] ) )
- unset( $attachment['ID'] );
+ unset( $attachment['ID'] );
// Save the data
- $id = wp_insert_attachment($attachment, $file, $post_id);
+ $id = wp_insert_attachment( $attachment, $file, $post_id, true );
if ( !is_wp_error($id) ) {
wp_update_attachment_metadata( $id, wp_generate_attachment_metadata( $id, $file ) );
}
@@ -369,17 +389,17 @@
}
/**
- * This handles a sideloaded file in the same way as an uploaded file is handled by {@link media_handle_upload()}
+ * Handles a side-loaded file in the same way as an uploaded file is handled by media_handle_upload().
*
* @since 2.6.0
*
- * @param array $file_array Array similar to a {@link $_FILES} upload array
- * @param int $post_id The post ID the media is associated with
- * @param string $desc Description of the sideloaded file
- * @param array $post_data allows you to overwrite some of the attachment
- * @return int|object The ID of the attachment or a WP_Error on failure
+ * @param array $file_array Array similar to a `$_FILES` upload array.
+ * @param int $post_id The post ID the media is associated with.
+ * @param string $desc Optional. Description of the side-loaded file. Default null.
+ * @param array $post_data Optional. Post data to override. Default empty array.
+ * @return int|object The ID of the attachment or a WP_Error on failure.
*/
-function media_handle_sideload($file_array, $post_id, $desc = null, $post_data = array()) {
+function media_handle_sideload( $file_array, $post_id, $desc = null, $post_data = array() ) {
$overrides = array('test_form'=>false);
$time = current_time( 'mysql' );
@@ -399,7 +419,7 @@
$content = '';
// Use image exif/iptc data for title and caption defaults if possible.
- if ( $image_meta = @wp_read_image_metadata($file) ) {
+ if ( $image_meta = wp_read_image_metadata( $file ) ) {
if ( trim( $image_meta['title'] ) && ! is_numeric( sanitize_title( $image_meta['title'] ) ) )
$title = $image_meta['title'];
if ( trim( $image_meta['caption'] ) )
@@ -419,8 +439,7 @@
), $post_data );
// This should never be set as it would then overwrite an existing attachment.
- if ( isset( $attachment['ID'] ) )
- unset( $attachment['ID'] );
+ unset( $attachment['ID'] );
// Save the attachment metadata
$id = wp_insert_attachment($attachment, $file, $post_id);
@@ -435,6 +454,8 @@
*
* @since 2.5.0
*
+ * @global int $body_id
+ *
* @param string|callable $content_func
*/
function wp_iframe($content_func /* ... */) {
@@ -447,7 +468,7 @@
// Check callback name for 'media'
if ( ( is_array( $content_func ) && ! empty( $content_func[1] ) && 0 === strpos( (string) $content_func[1], 'media' ) )
|| ( ! is_array( $content_func ) && 0 === strpos( $content_func, 'media' ) ) )
- wp_enqueue_style( 'media' );
+ wp_enqueue_style( 'deprecated-media' );
wp_enqueue_style( 'ie' );
?>
<script type="text/javascript">
@@ -529,6 +550,10 @@
*
* @since 2.5.0
*
+ * @global int $post_ID
+ *
+ * @staticvar int $instance
+ *
* @param string $editor_id
*/
function media_buttons($editor_id = 'content') {
@@ -546,17 +571,18 @@
$img = '<span class="wp-media-buttons-icon"></span> ';
$id_attribute = $instance === 1 ? ' id="insert-media-button"' : '';
- printf( '<a href="#"%s class="button insert-media add_media" data-editor="%s" title="%s">%s</a>',
+ printf( '<button type="button"%s class="button insert-media add_media" data-editor="%s">%s</button>',
$id_attribute,
esc_attr( $editor_id ),
- esc_attr__( 'Add Media' ),
$img . __( 'Add Media' )
);
/**
- * Filter the legacy (pre-3.5.0) media buttons.
+ * Filters the legacy (pre-3.5.0) media buttons.
+ *
+ * Use {@see 'media_buttons'} action instead.
*
* @since 2.5.0
- * @deprecated 3.5.0 Use 'media_buttons' action instead.
+ * @deprecated 3.5.0 Use {@see 'media_buttons'} action instead.
*
* @param string $string Media buttons context. Default empty.
*/
@@ -569,7 +595,6 @@
echo $legacy_filter;
}
}
-add_action( 'media_buttons', 'media_buttons' );
/**
*
@@ -594,7 +619,7 @@
$upload_iframe_src = add_query_arg('tab', $tab, $upload_iframe_src);
/**
- * Filter the upload iframe source URL for a specific media type.
+ * Filters the upload iframe source URL for a specific media type.
*
* The dynamic portion of the hook name, `$type`, refers to the type
* of media uploaded.
@@ -603,13 +628,13 @@
*
* @param string $upload_iframe_src The upload iframe source URL by type.
*/
- $upload_iframe_src = apply_filters( $type . '_upload_iframe_src', $upload_iframe_src );
+ $upload_iframe_src = apply_filters( "{$type}_upload_iframe_src", $upload_iframe_src );
return add_query_arg('TB_iframe', true, $upload_iframe_src);
}
/**
- * {@internal Missing Short Description}}
+ * Handles form submissions for the legacy media uploader.
*
* @since 2.5.0
*
@@ -646,14 +671,14 @@
}
/**
- * Filter the attachment fields to be saved.
+ * Filters the attachment fields to be saved.
*
* @since 2.5.0
*
* @see wp_get_attachment_metadata()
*
- * @param WP_Post $post The WP_Post object.
- * @param array $attachment An array of attachment metadata.
+ * @param array $post An array of post data.
+ * @param array $attachment An array of attachment metadata.
*/
$post = apply_filters( 'attachment_fields_to_save', $post, $attachment );
@@ -702,7 +727,7 @@
}
/**
- * Filter the HTML markup for a media item sent to the editor.
+ * Filters the HTML markup for a media item sent to the editor.
*
* @since 2.5.0
*
@@ -720,7 +745,7 @@
}
/**
- * {@internal Missing Short Description}}
+ * Handles the process of uploading media.
*
* @since 2.5.0
*
@@ -760,7 +785,7 @@
$type = $ext_type;
/**
- * Filter the URL sent to the editor for a specific media type.
+ * Filters the URL sent to the editor for a specific media type.
*
* The dynamic portion of the hook name, `$type`, refers to the type
* of media being sent.
@@ -771,7 +796,7 @@
* @param string $src Media source URL.
* @param string $title Media title.
*/
- $html = apply_filters( $type . '_send_to_editor_url', $html, esc_url_raw( $src ), $title );
+ $html = apply_filters( "{$type}_send_to_editor_url", $html, esc_url_raw( $src ), $title );
} else {
$align = '';
$alt = esc_attr( wp_unslash( $_POST['alt'] ) );
@@ -783,7 +808,7 @@
$html = "<img src='" . esc_url($src) . "' alt='$alt'$class />";
/**
- * Filter the image URL sent to the editor.
+ * Filters the image URL sent to the editor.
*
* @since 2.8.0
*
@@ -801,7 +826,9 @@
if ( isset( $_POST['save'] ) ) {
$errors['upload_notice'] = __('Saved.');
- return media_upload_gallery();
+ wp_enqueue_script( 'admin-gallery' );
+ return wp_iframe( 'media_upload_gallery_form', $errors );
+
} elseif ( ! empty( $_POST ) ) {
$return = media_upload_form_handler();
@@ -822,20 +849,27 @@
}
/**
- * Download an image from the specified URL and attach it to a post.
+ * Downloads an image from the specified URL and attaches it to a post.
*
* @since 2.6.0
+ * @since 4.2.0 Introduced the `$return` parameter.
+ * @since 4.8.0 Introduced the 'id' option within the `$return` parameter.
*
- * @param string $file The URL of the image to download
- * @param int $post_id The post ID the media is to be associated with
- * @param string $desc Optional. Description of the image
- * @param string $return Optional. What to return: an image tag (default) or only the src.
- * @return string|WP_Error Populated HTML img tag on success
+ * @param string $file The URL of the image to download.
+ * @param int $post_id The post ID the media is to be associated with.
+ * @param string $desc Optional. Description of the image.
+ * @param string $return Optional. Accepts 'html' (image tag html) or 'src' (URL), or 'id' (attachment ID). Default 'html'.
+ * @return string|WP_Error Populated HTML img tag on success, WP_Error object otherwise.
*/
function media_sideload_image( $file, $post_id, $desc = null, $return = 'html' ) {
if ( ! empty( $file ) ) {
+
// Set variables for storage, fix file filename for query strings.
preg_match( '/[^\?]+\.(jpe?g|jpe|gif|png)\b/i', $file, $matches );
+ if ( ! $matches ) {
+ return new WP_Error( 'image_sideload_failed', __( 'Invalid image URL' ) );
+ }
+
$file_array = array();
$file_array['name'] = basename( $matches[0] );
@@ -854,12 +888,15 @@
if ( is_wp_error( $id ) ) {
@unlink( $file_array['tmp_name'] );
return $id;
+ // If attachment id was requested, return it early.
+ } elseif ( $return === 'id' ) {
+ return $id;
}
$src = wp_get_attachment_url( $id );
}
- // Finally check to make sure the file has been saved, then return the HTML.
+ // Finally, check to make sure the file has been saved, then return the HTML.
if ( ! empty( $src ) ) {
if ( $return === 'src' ) {
return $src;
@@ -874,7 +911,7 @@
}
/**
- * {@internal Missing Short Description}}
+ * Retrieves the legacy media uploader form in an iframe.
*
* @since 2.5.0
*
@@ -897,7 +934,7 @@
}
/**
- * {@internal Missing Short Description}}
+ * Retrieves the legacy media library form in an iframe.
*
* @since 2.5.0
*
@@ -956,7 +993,7 @@
*/
function image_size_input_fields( $post, $check = '' ) {
/**
- * Filter the names and labels of the default image sizes.
+ * Filters the names and labels of the default image sizes.
*
* @since 3.3.0
*
@@ -1050,6 +1087,14 @@
";
}
+/**
+ * Output a textarea element for inputting an attachment caption.
+ *
+ * @since 3.4.0
+ *
+ * @param WP_Post $edit_post Attachment WP_Post object.
+ * @return string HTML markup for the textarea element.
+ */
function wp_caption_input_textarea($edit_post) {
// Post data is already escaped.
$name = "attachments[{$edit_post->ID}][post_excerpt]";
@@ -1058,7 +1103,7 @@
}
/**
- * {@internal Missing Short Description}}
+ * Retrieves the image attachment fields to edit form fields.
*
* @since 2.5.0
*
@@ -1071,7 +1116,7 @@
}
/**
- * {@internal Missing Short Description}}
+ * Retrieves the single non-image attachment fields to edit form fields.
*
* @since 2.5.0
*
@@ -1085,7 +1130,7 @@
}
/**
- * {@internal Missing Short Description}}
+ * Retrieves the post non-image attachment fields to edito form fields.
*
* @since 2.8.0
*
@@ -1102,7 +1147,7 @@
* Filters input from media_upload_form_handler() and assigns a default
* post_title from the file name if none supplied.
*
- * Illustrates the use of the attachment_fields_to_save filter
+ * Illustrates the use of the {@see 'attachment_fields_to_save'} filter
* which can be used to add default values to any field before saving to DB.
*
* @since 2.5.0
@@ -1123,10 +1168,8 @@
return $post;
}
-add_filter( 'attachment_fields_to_save', 'image_attachment_fields_to_save', 10, 2 );
-
/**
- * {@internal Missing Short Description}}
+ * Retrieves the media element HTML to send to the editor.
*
* @since 2.5.0
*
@@ -1142,7 +1185,7 @@
$align = !empty($attachment['align']) ? $attachment['align'] : 'none';
$size = !empty($attachment['image-size']) ? $attachment['image-size'] : 'medium';
$alt = !empty($attachment['image_alt']) ? $attachment['image_alt'] : '';
- $rel = ( $url == get_attachment_link($attachment_id) );
+ $rel = ( strpos( $url, 'attachment_id') || $url === get_attachment_link( $attachment_id ) );
return get_image_send_to_editor($attachment_id, $attachment['post_excerpt'], $attachment['post_title'], $align, $url, $rel, $size, $alt);
}
@@ -1150,10 +1193,8 @@
return $html;
}
-add_filter('media_send_to_editor', 'image_media_send_to_editor', 10, 3);
-
/**
- * {@internal Missing Short Description}}
+ * Retrieves the attachment fields to edit form fields.
*
* @since 2.5.0
*
@@ -1229,7 +1270,7 @@
}
// Merge default fields with their errors, so any key passed with the error (e.g. 'error', 'helps', 'value') will replace the default
- // The recursive merge is easily traversed with array casting: foreach( (array) $things as $thing )
+ // The recursive merge is easily traversed with array casting: foreach ( (array) $things as $thing )
$form_fields = array_merge_recursive($form_fields, (array) $errors);
// This was formerly in image_attachment_fields_to_edit().
@@ -1259,7 +1300,7 @@
}
/**
- * Filter the attachment fields to edit.
+ * Filters the attachment fields to edit.
*
* @since 2.5.0
*
@@ -1280,6 +1321,8 @@
*
* @since 2.5.0
*
+ * @global WP_Query $wp_the_query
+ *
* @param int $post_id Optional. Post ID.
* @param array $errors Errors for attachment, if any.
* @return string
@@ -1314,6 +1357,8 @@
*
* @since 2.5.0
*
+ * @global string $redir_tab
+ *
* @param int $attachment_id Attachment ID for modification.
* @param string|array $args Optional. Override defaults.
* @return string HTML form for attachment.
@@ -1339,7 +1384,7 @@
$args = wp_parse_args( $args, $default_args );
/**
- * Filter the arguments used to retrieve an image for the edit image form.
+ * Filters the arguments used to retrieve an image for the edit image form.
*
* @since 3.1.0
*
@@ -1352,7 +1397,8 @@
$toggle_on = __( 'Show' );
$toggle_off = __( 'Hide' );
- $filename = esc_html( wp_basename( $post->guid ) );
+ $file = get_attached_file( $post->ID );
+ $filename = esc_html( wp_basename( $file ) );
$title = esc_attr( $post->post_title );
$post_mime_types = get_post_mime_types();
@@ -1396,7 +1442,7 @@
$media_dims .= "<span id='media-dims-$post->ID'>{$meta['width']} × {$meta['height']}</span> ";
/**
- * Filter the media metadata.
+ * Filters the media metadata.
*
* @since 2.5.0
*
@@ -1428,7 +1474,7 @@
<td>
<p><strong>" . __('File name:') . "</strong> $filename</p>
<p><strong>" . __('File type:') . "</strong> $post->post_mime_type</p>
- <p><strong>" . __('Upload date:') . "</strong> " . mysql2date( get_option('date_format'), $post->post_date ). '</p>';
+ <p><strong>" . __('Upload date:') . "</strong> " . mysql2date( __( 'F j, Y' ), $post->post_date ). '</p>';
if ( !empty( $media_dims ) )
$item .= "<p><strong>" . __('Dimensions:') . "</strong> $media_dims</p>\n";
@@ -1437,8 +1483,9 @@
$item .= "
</thead>
<tbody>
- <tr><td colspan='2' class='imgedit-response' id='imgedit-response-$post->ID'></td></tr>
- <tr><td style='display:none' colspan='2' class='image-editor' id='image-editor-$post->ID'></td></tr>\n";
+ <tr><td colspan='2' class='imgedit-response' id='imgedit-response-$post->ID'></td></tr>\n
+ <tr><td style='display:none' colspan='2' class='image-editor' id='image-editor-$post->ID'></td></tr>\n
+ <tr><td colspan='2'><p class='media-types media-types-required-info'>" . sprintf( __( 'Required fields are marked %s' ), '<span class="required">*</span>' ) . "</p></td></tr>\n";
$defaults = array(
'input' => 'text',
@@ -1448,7 +1495,7 @@
);
if ( $r['send'] ) {
- $r['send'] = get_submit_button( __( 'Insert into Post' ), 'button', "send[$attachment_id]", false );
+ $r['send'] = get_submit_button( __( 'Insert into Post' ), '', "send[$attachment_id]", false );
}
$delete = empty( $r['delete'] ) ? '' : $r['delete'];
@@ -1457,7 +1504,9 @@
$delete = "<a href='" . wp_nonce_url( "post.php?action=delete&post=$attachment_id", 'delete-post_' . $attachment_id ) . "' id='del[$attachment_id]' class='delete-permanently'>" . __( 'Delete Permanently' ) . '</a>';
} elseif ( !MEDIA_TRASH ) {
$delete = "<a href='#' class='del-link' onclick=\"document.getElementById('del_attachment_$attachment_id').style.display='block';return false;\">" . __( 'Delete' ) . "</a>
- <div id='del_attachment_$attachment_id' class='del-attachment' style='display:none;'><p>" . sprintf( __( 'You are about to delete <strong>%s</strong>.' ), $filename ) . "</p>
+ <div id='del_attachment_$attachment_id' class='del-attachment' style='display:none;'>" .
+ /* translators: %s: file name */
+ '<p>' . sprintf( __( 'You are about to delete %s.' ), '<strong>' . $filename . '</strong>' ) . "</p>
<a href='" . wp_nonce_url( "post.php?action=delete&post=$attachment_id", 'delete-post_' . $attachment_id ) . "' id='del[$attachment_id]' class='button'>" . __( 'Continue' ) . "</a>
<a href='#' class='button' onclick=\"this.parentNode.style.display='none';return false;\">" . __( 'Cancel' ) . "</a>
</div>";
@@ -1478,8 +1527,12 @@
}
if ( 'image' == $type && $calling_post_id && current_theme_supports( 'post-thumbnails', get_post_type( $calling_post_id ) )
&& post_type_supports( get_post_type( $calling_post_id ), 'thumbnail' ) && get_post_thumbnail_id( $calling_post_id ) != $attachment_id ) {
+
+ $calling_post = get_post( $calling_post_id );
+ $calling_post_type_object = get_post_type_object( $calling_post->post_type );
+
$ajax_nonce = wp_create_nonce( "set_post_thumbnail-$calling_post_id" );
- $thumbnail = "<a class='wp-post-thumbnail' id='wp-post-thumbnail-" . $attachment_id . "' href='#' onclick='WPSetAsThumbnail(\"$attachment_id\", \"$ajax_nonce\");return false;'>" . esc_html__( "Use as featured image" ) . "</a>";
+ $thumbnail = "<a class='wp-post-thumbnail' id='wp-post-thumbnail-" . $attachment_id . "' href='#' onclick='WPSetAsThumbnail(\"$attachment_id\", \"$ajax_nonce\");return false;'>" . esc_html( $calling_post_type_object->labels->use_featured_image ) . "</a>";
}
if ( ( $r['send'] || $thumbnail || $delete ) && !isset( $form_fields['buttons'] ) ) {
@@ -1504,12 +1557,13 @@
continue;
}
- $required = $field['required'] ? '<span class="alignright"><abbr title="required" class="required">*</abbr></span>' : '';
- $aria_required = $field['required'] ? " aria-required='true' " : '';
+ $required = $field['required'] ? '<span class="required">*</span>' : '';
+ $required_attr = $field['required'] ? ' required' : '';
+ $aria_required = $field['required'] ? " aria-required='true'" : '';
$class = $id;
$class .= $field['required'] ? ' form-required' : '';
- $item .= "\t\t<tr class='$class'>\n\t\t\t<th scope='row' class='label'><label for='$name'><span class='alignleft'>{$field['label']}</span>$required<br class='clear' /></label></th>\n\t\t\t<td class='field'>";
+ $item .= "\t\t<tr class='$class'>\n\t\t\t<th scope='row' class='label'><label for='$name'><span class='alignleft'>{$field['label']}{$required}</span><br class='clear' /></label></th>\n\t\t\t<td class='field'>";
if ( !empty( $field[ $field['input'] ] ) )
$item .= $field[ $field['input'] ];
elseif ( $field['input'] == 'textarea' ) {
@@ -1518,9 +1572,9 @@
$field['value'] = htmlspecialchars( $field['value'], ENT_QUOTES );
}
// Post_excerpt is already escaped by sanitize_post() in get_attachment_fields_to_edit().
- $item .= "<textarea id='$name' name='$name' $aria_required>" . $field['value'] . '</textarea>';
+ $item .= "<textarea id='$name' name='$name'{$required_attr}{$aria_required}>" . $field['value'] . '</textarea>';
} else {
- $item .= "<input type='text' class='text' id='$name' name='$name' value='" . esc_attr( $field['value'] ) . "' $aria_required />";
+ $item .= "<input type='text' class='text' id='$name' name='$name' value='" . esc_attr( $field['value'] ) . "'{$required_attr}{$aria_required} />";
}
if ( !empty( $field['helps'] ) )
$item .= "<p class='help'>" . join( "</p>\n<p class='help'>", array_unique( (array) $field['helps'] ) ) . '</p>';
@@ -1559,6 +1613,13 @@
return $item;
}
+/**
+ * @since 3.5.0
+ *
+ * @param int $attachment_id
+ * @param array $args
+ * @return array
+ */
function get_compat_media_markup( $attachment_id, $args = null ) {
$post = get_post( $attachment_id );
@@ -1602,7 +1663,7 @@
}
// Merge default fields with their errors, so any key passed with the error (e.g. 'error', 'helps', 'value') will replace the default
- // The recursive merge is easily traversed with array casting: foreach( (array) $things as $thing )
+ // The recursive merge is easily traversed with array casting: foreach ( (array) $things as $thing )
$form_fields = array_merge_recursive($form_fields, (array) $args['errors'] );
/** This filter is documented in wp-admin/includes/media.php */
@@ -1650,8 +1711,9 @@
}
$readonly = ! $user_can_edit && ! empty( $field['taxonomy'] ) ? " readonly='readonly' " : '';
- $required = $field['required'] ? '<span class="alignright"><abbr title="required" class="required">*</abbr></span>' : '';
- $aria_required = $field['required'] ? " aria-required='true' " : '';
+ $required = $field['required'] ? '<span class="required">*</span>' : '';
+ $required_attr = $field['required'] ? ' required' : '';
+ $aria_required = $field['required'] ? " aria-required='true'" : '';
$class = 'compat-field-' . $id;
$class .= $field['required'] ? ' form-required' : '';
@@ -1666,9 +1728,9 @@
// sanitize_post() skips the post_content when user_can_richedit.
$field['value'] = htmlspecialchars( $field['value'], ENT_QUOTES );
}
- $item .= "<textarea id='$id_attr' name='$name' $aria_required>" . $field['value'] . '</textarea>';
+ $item .= "<textarea id='$id_attr' name='$name'{$required_attr}{$aria_required}>" . $field['value'] . '</textarea>';
} else {
- $item .= "<input type='text' class='text' id='$id_attr' name='$name' value='" . esc_attr( $field['value'] ) . "' $readonly $aria_required />";
+ $item .= "<input type='text' class='text' id='$id_attr' name='$name' value='" . esc_attr( $field['value'] ) . "' $readonly{$required_attr}{$aria_required} />";
}
if ( !empty( $field['helps'] ) )
$item .= "<p class='help'>" . join( "</p>\n<p class='help'>", array_unique( (array) $field['helps'] ) ) . '</p>';
@@ -1692,8 +1754,12 @@
if ( !empty( $form_fields['_final'] ) )
$item .= "\t\t<tr class='final'><td colspan='2'>{$form_fields['_final']}</td></tr>\n";
- if ( $item )
- $item = '<table class="compat-attachment-fields">' . $item . '</table>';
+
+ if ( $item ) {
+ $item = '<p class="media-types media-types-required-info">' .
+ sprintf( __( 'Required fields are marked %s' ), '<span class="required">*</span>' ) . '</p>
+ <table class="compat-attachment-fields">' . $item . '</table>';
+ }
foreach ( $hidden_fields as $hidden_field => $value ) {
$item .= '<input type="hidden" name="' . esc_attr( $hidden_field ) . '" value="' . esc_attr( $value ) . '" />' . "\n";
@@ -1709,13 +1775,14 @@
}
/**
- * {@internal Missing Short Description}}
+ * Outputs the legacy media upload header.
*
* @since 2.5.0
*/
function media_upload_header() {
$post_id = isset( $_REQUEST['post_id'] ) ? intval( $_REQUEST['post_id'] ) : 0;
- echo '<script type="text/javascript">post_id = ' . $post_id . ";</script>\n";
+
+ echo '<script type="text/javascript">post_id = ' . $post_id . ';</script>';
if ( empty( $_GET['chromeless'] ) ) {
echo '<div id="media-upload-header">';
the_media_upload_tabs();
@@ -1724,10 +1791,15 @@
}
/**
- * {@internal Missing Short Description}}
+ * Outputs the legacy media upload form.
*
* @since 2.5.0
*
+ * @global string $type
+ * @global string $tab
+ * @global bool $is_IE
+ * @global bool $is_opera
+ *
* @param array $errors
*/
function media_upload_form( $errors = null ) {
@@ -1788,7 +1860,7 @@
);
/**
- * Filter the media upload post parameters.
+ * Filters the media upload post parameters.
*
* @since 3.1.0 As 'swfupload_post_params'
* @since 3.3.0
@@ -1797,15 +1869,16 @@
*/
$post_params = apply_filters( 'upload_post_params', $post_params );
+/*
+ * Since 4.9 the `runtimes` setting is hardcoded in our version of Plupload to `html5,html4`,
+ * and the `flash_swf_url` and `silverlight_xap_url` are not used.
+ */
$plupload_init = array(
- 'runtimes' => 'html5,flash,silverlight,html4',
'browse_button' => 'plupload-browse-button',
'container' => 'plupload-upload-ui',
'drop_element' => 'drag-drop-area',
'file_data_name' => 'async-upload',
'url' => $upload_action_url,
- 'flash_swf_url' => includes_url( 'js/plupload/plupload.flash.swf' ),
- 'silverlight_xap_url' => includes_url( 'js/plupload/plupload.silverlight.xap' ),
'filters' => array(
'max_file_size' => $max_upload_size . 'b',
),
@@ -1821,7 +1894,7 @@
}
/**
- * Filter the default Plupload settings.
+ * Filters the default Plupload settings.
*
* @since 3.3.0
*
@@ -1883,7 +1956,7 @@
<p id="async-upload-wrap">
<label class="screen-reader-text" for="async-upload"><?php _e('Upload'); ?></label>
<input type="file" name="async-upload" id="async-upload" />
- <?php submit_button( __( 'Upload' ), 'button', 'html-upload', false ); ?>
+ <?php submit_button( __( 'Upload' ), 'primary', 'html-upload', false ); ?>
<a href="#" onclick="try{top.tb_remove();}catch(e){}; return false;"><?php _e('Cancel'); ?></a>
</p>
<div class="clear"></div>
@@ -1911,7 +1984,7 @@
}
/**
- * {@internal Missing Short Description}}
+ * Outputs the legacy media upload form for a given media type.
*
* @since 2.5.0
*
@@ -1928,7 +2001,7 @@
$form_action_url = admin_url("media-upload.php?type=$type&tab=type&post_id=$post_id");
/**
- * Filter the media upload form action URL.
+ * Filters the media upload form action URL.
*
* @since 2.6.0
*
@@ -1974,14 +2047,14 @@
?></div>
<p class="savebutton ml-submit">
-<?php submit_button( __( 'Save all changes' ), 'button', 'save', false ); ?>
+<?php submit_button( __( 'Save all changes' ), '', 'save', false ); ?>
</p>
</form>
<?php
}
/**
- * {@internal Missing Short Description}}
+ * Outputs the legacy media upload form for external media.
*
* @since 2.7.0
*
@@ -2065,7 +2138,7 @@
t.width = t.height = '';
document.getElementById('go_button').style.color = '#bbb';
if ( ! document.forms[0].src.value )
- document.getElementById('status_img').innerHTML = '*';
+ document.getElementById('status_img').innerHTML = '';
else document.getElementById('status_img').innerHTML = '<img src="<?php echo esc_url( admin_url( 'images/no.png' ) ); ?>" alt="" />';
},
@@ -2108,7 +2181,7 @@
<div class="media-item media-blank">
<?php
/**
- * Filter the insert media from URL form HTML.
+ * Filters the insert media from URL form HTML.
*
* @since 3.3.0
*
@@ -2127,6 +2200,10 @@
*
* @since 2.5.0
*
+ * @global string $redir_tab
+ * @global string $type
+ * @global string $tab
+ *
* @param array $errors
*/
function media_upload_gallery_form($errors) {
@@ -2181,7 +2258,7 @@
</div>
<p class="ml-submit">
-<?php submit_button( __( 'Save all changes' ), 'button savebutton', 'save', false, array( 'id' => 'save-all', 'style' => 'display: none;' ) ); ?>
+<?php submit_button( __( 'Save all changes' ), 'savebutton', 'save', false, array( 'id' => 'save-all', 'style' => 'display: none;' ) ); ?>
<input type="hidden" name="post_id" id="post_id" value="<?php echo (int) $post_id; ?>" />
<input type="hidden" name="type" value="<?php echo esc_attr( $GLOBALS['type'] ); ?>" />
<input type="hidden" name="tab" value="<?php echo esc_attr( $GLOBALS['tab'] ); ?>" />
@@ -2268,10 +2345,17 @@
}
/**
- * {@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) {
@@ -2314,7 +2398,7 @@
<p id="media-search" class="search-box">
<label class="screen-reader-text" for="media-search-input"><?php _e('Search Media');?>:</label>
<input type="search" id="media-search-input" name="s" value="<?php the_search_query(); ?>" />
- <?php submit_button( __( 'Search Media' ), 'button', '', false ); ?>
+ <?php submit_button( __( 'Search Media' ), '', '', false ); ?>
</p>
<ul class="subsubsub">
@@ -2350,7 +2434,7 @@
$type_links[] = '<li><a href="' . esc_url(add_query_arg(array('post_mime_type'=>$mime_type, 'paged'=>false))) . '"' . $class . '>' . sprintf( translate_nooped_plural( $label[2], $num_posts[$mime_type] ), '<span id="' . $mime_type . '-counter">' . number_format_i18n( $num_posts[$mime_type] ) . '</span>') . '</a>';
}
/**
- * Filter the media upload mime type list items.
+ * Filters the media upload mime type list items.
*
* Returned values should begin with an `<li>` tag.
*
@@ -2411,7 +2495,7 @@
</select>
<?php } ?>
-<?php submit_button( __( 'Filter »' ), 'button', 'post-query-submit', false ); ?>
+<?php submit_button( __( 'Filter »' ), '', 'post-query-submit', false ); ?>
</div>
@@ -2441,7 +2525,7 @@
<?php echo get_media_items(null, $errors); ?>
</div>
<p class="ml-submit">
-<?php submit_button( __( 'Save all changes' ), 'button savebutton', 'save', false ); ?>
+<?php submit_button( __( 'Save all changes' ), 'savebutton', 'save', false ); ?>
<input type="hidden" name="post_id" id="post_id" value="<?php echo (int) $post_id; ?>" />
</p>
</form>
@@ -2484,21 +2568,21 @@
return '
<p class="media-types"><label><input type="radio" name="media_type" value="image" id="image-only"' . checked( 'image-only', $view, false ) . ' /> ' . __( 'Image' ) . '</label> <label><input type="radio" name="media_type" value="generic" id="not-image"' . checked( 'not-image', $view, false ) . ' /> ' . __( 'Audio, Video, or Other File' ) . '</label></p>
+ <p class="media-types media-types-required-info">' . sprintf( __( 'Required fields are marked %s' ), '<span class="required">*</span>' ) . '</p>
<table class="describe ' . $table_class . '"><tbody>
<tr>
<th scope="row" class="label" style="width:130px;">
- <label for="src"><span class="alignleft">' . __('URL') . '</span></label>
- <span class="alignright"><abbr id="status_img" title="required" class="required">*</abbr></span>
+ <label for="src"><span class="alignleft">' . __( 'URL' ) . '</span> <span class="required">*</span></label>
+ <span class="alignright" id="status_img"></span>
</th>
- <td class="field"><input id="src" name="src" value="" type="text" aria-required="true" onblur="addExtImage.getImageData()" /></td>
+ <td class="field"><input id="src" name="src" value="" type="text" required aria-required="true" onblur="addExtImage.getImageData()" /></td>
</tr>
<tr>
<th scope="row" class="label">
- <label for="title"><span class="alignleft">' . __('Title') . '</span></label>
- <span class="alignright"><abbr title="required" class="required">*</abbr></span>
+ <label for="title"><span class="alignleft">' . __( 'Title' ) . '</span> <span class="required">*</span></label>
</th>
- <td class="field"><input id="title" name="title" value="" type="text" aria-required="true" /></td>
+ <td class="field"><input id="title" name="title" value="" type="text" required aria-required="true" /></td>
</tr>
<tr class="not-image"><td></td><td><p class="help">' . __('Link text, e.g. “Ransom Demands (PDF)”') . '</p></td></tr>
@@ -2544,7 +2628,7 @@
<tr class="not-image">
<td></td>
<td>
- ' . get_submit_button( __( 'Insert into Post' ), 'button', 'insertonlybutton', false ) . '
+ ' . get_submit_button( __( 'Insert into Post' ), '', 'insertonlybutton', false ) . '
</td>
</tr>
</tbody></table>
@@ -2556,6 +2640,8 @@
* 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' );
@@ -2571,7 +2657,6 @@
</p>
<?php
}
-add_action('post-plupload-upload-ui', 'media_upload_flash_bypass');
/**
* Displays the browser's built-in uploader message.
@@ -2585,7 +2670,6 @@
</p>
<?php
}
-add_action('post-html-upload-ui', 'media_upload_html_bypass');
/**
* Used to display a "After a file has been uploaded..." help message.
@@ -2631,6 +2715,8 @@
* Displays the image and editor in the post editor
*
* @since 3.5.0
+ *
+ * @param WP_Post $post A post object.
*/
function edit_form_image_editor( $post ) {
$open = isset( $_GET['image-editor'] );
@@ -2644,7 +2730,7 @@
$alt_text = get_post_meta( $post->ID, '_wp_attachment_image_alt', true );
$att_url = wp_get_attachment_url( $post->ID ); ?>
- <div class="wp_attachment_holder">
+ <div class="wp_attachment_holder wp-clearfix">
<?php
if ( wp_attachment_is_image( $post->ID ) ) :
$image_edit_button = '';
@@ -2656,7 +2742,7 @@
<div class="imgedit-response" id="imgedit-response-<?php echo $attachment_id; ?>"></div>
- <div<?php if ( $open ) echo ' style="display:none"'; ?> class="wp_attachment_image" id="media-head-<?php echo $attachment_id; ?>">
+ <div<?php if ( $open ) echo ' style="display:none"'; ?> class="wp_attachment_image wp-clearfix" id="media-head-<?php echo $attachment_id; ?>">
<p id="thumbnail-head-<?php echo $attachment_id; ?>"><img class="thumbnail" src="<?php echo set_url_scheme( $thumb_url[0] ); ?>" style="max-width:100%" alt="" /></p>
<p><?php echo $image_edit_button; ?></p>
</div>
@@ -2694,6 +2780,27 @@
echo wp_video_shortcode( $attr );
+ elseif ( isset( $thumb_url[0] ) ):
+
+ ?>
+ <div class="wp_attachment_image wp-clearfix" id="media-head-<?php echo $attachment_id; ?>">
+ <p id="thumbnail-head-<?php echo $attachment_id; ?>">
+ <img class="thumbnail" src="<?php echo set_url_scheme( $thumb_url[0] ); ?>" style="max-width:100%" alt="" />
+ </p>
+ </div>
+ <?php
+
+ else:
+
+ /**
+ * Fires when an attachment type can't be rendered in the edit form.
+ *
+ * @since 4.6.0
+ *
+ * @param WP_Post $post A post object.
+ */
+ do_action( 'wp_edit_form_attachment_display', $post );
+
endif; ?>
</div>
<div class="wp_attachment_details edit-form-section">
@@ -2721,7 +2828,7 @@
);
?>
- <label for="content"><strong><?php _e( 'Description' ); ?></strong><?php
+ <label for="attachment_content"><strong><?php _e( 'Description' ); ?></strong><?php
if ( preg_match( '#^(audio|video)/#', $post->post_mime_type ) ) {
echo ': ' . __( 'Displayed on attachment pages.' );
} ?></label>
@@ -2735,14 +2842,15 @@
}
/**
- * Displays non-editable attachment metadata in the publish metabox
+ * Displays non-editable attachment metadata in the publish meta box.
*
* @since 3.5.0
*/
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 );
@@ -2754,8 +2862,8 @@
$att_url = wp_get_attachment_url( $post->ID );
?>
<div class="misc-pub-section misc-pub-attachment">
- <label for="attachment_url"><?php _e( 'File URL:' ); ?></label>
- <input type="text" class="widefat urlfield" readonly="readonly" name="attachment_url" value="<?php echo esc_attr($att_url); ?>" />
+ <label for="attachment_url"><?php _e( 'File URL:' ); ?></label>
+ <input type="text" class="widefat urlfield" readonly="readonly" name="attachment_url" id="attachment_url" value="<?php echo esc_attr( $att_url ); ?>" />
</div>
<div class="misc-pub-section misc-pub-filename">
<?php _e( 'File name:' ); ?> <strong><?php echo $filename; ?></strong>
@@ -2777,7 +2885,6 @@
</div>
<?php
- $file = get_attached_file( $post->ID );
$file_size = false;
if ( isset( $meta['filesize'] ) )
@@ -2793,21 +2900,24 @@
endif;
if ( preg_match( '#^(audio|video)/#', $post->post_mime_type ) ) {
+ $fields = array(
+ 'length_formatted' => __( 'Length:' ),
+ 'bitrate' => __( 'Bitrate:' ),
+ );
/**
- * Filter the audio and video metadata fields to be shown in the publish meta box.
+ * Filters 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
+ * @since 4.9.0 Added the `$post` parameter.
*
- * @param array $fields An array of the attachment metadata keys and labels.
+ * @param array $fields An array of the attachment metadata keys and labels.
+ * @param WP_Post $post WP_Post object for the current attachment.
*/
- $fields = apply_filters( 'media_submitbox_misc_sections', array(
- 'length_formatted' => __( 'Length:' ),
- 'bitrate' => __( 'Bitrate:' ),
- ) );
+ $fields = apply_filters( 'media_submitbox_misc_sections', $fields, $post );
foreach ( $fields as $key => $label ) {
if ( empty( $meta[ $key ] ) ) {
@@ -2832,20 +2942,24 @@
<?php
}
+ $fields = array(
+ 'dataformat' => __( 'Audio Format:' ),
+ 'codec' => __( 'Audio Codec:' )
+ );
+
/**
- * Filter the audio attachment metadata fields to be shown in the publish meta box.
+ * Filters the audio attachment 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
+ * @since 4.9.0 Added the `$post` parameter.
*
- * @param array $fields An array of the attachment metadata keys and labels.
+ * @param array $fields An array of the attachment metadata keys and labels.
+ * @param WP_Post $post WP_Post object for the current attachment.
*/
- $audio_fields = apply_filters( 'audio_submitbox_misc_sections', array(
- 'dataformat' => __( 'Audio Format:' ),
- 'codec' => __( 'Audio Codec:' )
- ) );
+ $audio_fields = apply_filters( 'audio_submitbox_misc_sections', $fields, $post );
foreach ( $audio_fields as $key => $label ) {
if ( empty( $meta['audio'][ $key ] ) ) {
@@ -2868,21 +2982,6 @@
endif;
}
-add_filter( 'async_upload_image', 'get_media_item', 10, 2 );
-add_filter( 'async_upload_audio', 'get_media_item', 10, 2 );
-add_filter( 'async_upload_video', 'get_media_item', 10, 2 );
-add_filter( 'async_upload_file', 'get_media_item', 10, 2 );
-
-add_action( 'media_upload_image', 'wp_media_upload_handler' );
-add_action( 'media_upload_audio', 'wp_media_upload_handler' );
-add_action( 'media_upload_video', 'wp_media_upload_handler' );
-add_action( 'media_upload_file', 'wp_media_upload_handler' );
-
-add_filter( 'media_upload_gallery', 'media_upload_gallery' );
-add_filter( 'media_upload_library', 'media_upload_library' );
-
-add_action( 'attachment_submitbox_misc_actions', 'attachment_submitbox_metadata' );
-
/**
* Parse ID3v2, ID3v1, and getID3 comments to extract usable data
*
@@ -2896,7 +2995,7 @@
if ( ! empty( $data[$version]['comments'] ) ) {
foreach ( $data[$version]['comments'] as $key => $list ) {
if ( 'length' !== $key && ! empty( $list ) ) {
- $metadata[$key] = reset( $list );
+ $metadata[$key] = wp_kses_post( reset( $list ) );
// Fix bug in byte stream analysis.
if ( 'terms_of_use' === $key && 0 === strpos( $metadata[$key], 'yright notice.' ) )
$metadata[$key] = 'Cop' . $metadata[$key];
@@ -2936,13 +3035,19 @@
* @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 );
@@ -2978,9 +3083,32 @@
$metadata['audio'] = $data['audio'];
}
+ if ( empty( $metadata['created_timestamp'] ) ) {
+ $created_timestamp = wp_get_media_creation_timestamp( $data );
+
+ if ( $created_timestamp !== false ) {
+ $metadata['created_timestamp'] = $created_timestamp;
+ }
+ }
+
wp_add_id3_tag_data( $metadata, $data );
- return $metadata;
+ $file_format = isset( $metadata['fileformat'] ) ? $metadata['fileformat'] : null;
+
+ /**
+ * Filters the array of metadata retrieved from a video.
+ *
+ * In core, usually this selection is what is stored.
+ * More complete data can be parsed from the `$data` parameter.
+ *
+ * @since 4.9.0
+ *
+ * @param array $metadata Filtered Video metadata.
+ * @param string $file Path to video file.
+ * @param string $file_format File format of video, as analyzed by getID3.
+ * @param string $data Raw metadata from getID3.
+ */
+ return apply_filters( 'wp_read_video_metadata', $metadata, $file, $file_format, $data );
}
/**
@@ -2989,15 +3117,21 @@
* @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 );
@@ -3023,6 +3157,55 @@
}
/**
+ * Parse creation date from media metadata.
+ *
+ * The getID3 library doesn't have a standard method for getting creation dates,
+ * so the location of this data can vary based on the MIME type.
+ *
+ * @since 4.9.0
+ *
+ * @link https://github.com/JamesHeinrich/getID3/blob/master/structure.txt
+ *
+ * @param array $metadata The metadata returned by getID3::analyze().
+ * @return int|bool A UNIX timestamp for the media's creation date if available
+ * or a boolean FALSE if a timestamp could not be determined.
+ */
+function wp_get_media_creation_timestamp( $metadata ) {
+ $creation_date = false;
+
+ if ( empty( $metadata['fileformat'] ) ) {
+ return $creation_date;
+ }
+
+ switch ( $metadata['fileformat'] ) {
+ case 'asf':
+ if ( isset( $metadata['asf']['file_properties_object']['creation_date_unix'] ) ) {
+ $creation_date = (int) $metadata['asf']['file_properties_object']['creation_date_unix'];
+ }
+ break;
+
+ case 'matroska':
+ case 'webm':
+ if ( isset( $metadata['matroska']['comments']['creation_time']['0'] ) ) {
+ $creation_date = strtotime( $metadata['matroska']['comments']['creation_time']['0'] );
+ }
+ elseif ( isset( $metadata['matroska']['info']['0']['DateUTC_unix'] ) ) {
+ $creation_date = (int) $metadata['matroska']['info']['0']['DateUTC_unix'];
+ }
+ break;
+
+ case 'quicktime':
+ case 'mp4':
+ if ( isset( $metadata['quicktime']['moov']['subatoms']['0']['creation_time_unix'] ) ) {
+ $creation_date = (int) $metadata['quicktime']['moov']['subatoms']['0']['creation_time_unix'];
+ }
+ break;
+ }
+
+ return $creation_date;
+}
+
+/**
* Encapsulate logic for Attach/Detach actions
*
* @since 4.2.0
@@ -3041,7 +3224,7 @@
}
if ( ! current_user_can( 'edit_post', $parent_id ) ) {
- wp_die( __( 'You are not allowed to edit this post.' ) );
+ wp_die( __( 'Sorry, you are not allowed to edit this post.' ) );
}
$ids = array();
foreach ( (array) $_REQUEST['media'] as $att_id ) {