);
/**
- * 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
*
*
* @since 2.5.0
*
+ * @global wpdb $wpdb WordPress database abstraction object.
+ *
* @param array $tabs
* @return array $tabs with gallery if post has image attachment
*/
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;
}
/**
- * {@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 = '') {
+function get_image_send_to_editor( $id, $caption, $title, $align, $url = '', $rel = false, $size = 'medium', $alt = '' ) {
- $html = get_image_tag($id, $alt, '', $align, $size);
+ $html = get_image_tag( $id, $alt, '', $align, $size );
- $rel = $rel ? ' rel="attachment wp-att-' . esc_attr($id).'"' : '';
+ 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 );
* @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 whether to disable captions.
+ * 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'}
+ * Filters from being evaluated at the end of image_add_caption().
+ *
+ * @since 4.1.0
+ *
+ * @param string $caption The original caption text.
+ * @param int $id The attachment ID.
+ */
+ $caption = apply_filters( 'image_add_caption_text', $caption, $id );
+
+ /**
+ * Filters whether to disable captions.
*
* Prevents image captions from being appended to image HTML when inserted into the editor.
*
$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
*
*/
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()
function media_send_to_editor($html) {
?>
<script type="text/javascript">
-/* <![CDATA[ */
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;
}
/**
- * This handles the file upload POST itself, creating the attachment post.
+ * Save a file submitted from a POST request and create an attachment post for it.
*
* @since 2.5.0
*
- * @param string $file_id Index into the {@link $_FILES} array of the upload
- * @param int $post_id The post ID the media is associated with
- * @param array $post_data allows you to overwrite some of the attachment
- * @param array $overrides allows you to override the {@link wp_handle_upload()} behavior
+ * @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 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 = $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 = '';
if ( preg_match( '#^audio#', $type ) ) {
$meta = wp_read_audio_metadata( $file );
- if ( ! empty( $meta['title'] ) )
+ if ( ! empty( $meta['title'] ) ) {
$title = $meta['title'];
-
- $content = '';
+ }
if ( ! empty( $title ) ) {
if ( ! empty( $meta['album'] ) && ! empty( $meta['artist'] ) ) {
/* translators: 1: audio track title, 2: album title, 3: artist name */
$content .= sprintf( __( '"%1$s" from %2$s by %3$s.' ), $title, $meta['album'], $meta['artist'] );
- } else if ( ! empty( $meta['album'] ) ) {
+ } elseif ( ! empty( $meta['album'] ) ) {
/* translators: 1: audio track title, 2: album title */
$content .= sprintf( __( '"%1$s" from %2$s.' ), $title, $meta['album'] );
- } else if ( ! empty( $meta['artist'] ) ) {
+ } elseif ( ! empty( $meta['artist'] ) ) {
/* 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 );
}
- } else if ( ! empty( $meta['album'] ) ) {
+ } elseif ( ! empty( $meta['album'] ) ) {
if ( ! empty( $meta['artist'] ) ) {
/* translators: 1: audio album title, 2: artist name */
$content .= $meta['album'] . '.';
}
- } else if ( ! empty( $meta['artist'] ) ) {
+ } elseif ( ! empty( $meta['artist'] ) ) {
$content .= $meta['artist'] . '.';
}
- 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 ( $image_meta = @wp_read_image_metadata( $file ) ) {
- if ( trim( $image_meta['title'] ) && ! is_numeric( sanitize_title( $image_meta['title'] ) ) )
+ } 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'];
- if ( trim( $image_meta['caption'] ) )
- $content = $image_meta['caption'];
+ }
+
+ if ( trim( $image_meta['caption'] ) ) {
+ $excerpt = $image_meta['caption'];
+ }
}
// Construct the attachment array
'post_parent' => $post_id,
'post_title' => $title,
'post_content' => $content,
+ 'post_excerpt' => $excerpt,
), $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);
}
/**
- * 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' );
), $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);
*
* @since 2.5.0
*
- * @param array $content_func
+ * @global int $body_id
+ *
+ * @param string|callable $content_func
*/
function wp_iframe($content_func /* ... */) {
_wp_admin_html_begin();
// 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">
-//<![CDATA[
addLoadEvent = function(func){if(typeof jQuery!="undefined")jQuery(document).ready(func);else if(typeof wpOnload!='function'){wpOnload=func;}else{var oldonload=wpOnload;wpOnload=function(){oldonload();func();}}};
var ajaxurl = '<?php echo admin_url( 'admin-ajax.php', 'relative' ); ?>', pagenow = 'media-upload-popup', adminpage = 'media-upload-popup',
isRtl = <?php echo (int) is_rtl(); ?>;
-//]]>
</script>
<?php
/** This action is documented in wp-admin/admin-header.php */
* Fires in the admin header for each specific form tab in the legacy
* (pre-3.5.0) media upload popup.
*
- * The dynamic portion of the hook, $content_func, refers to the form
+ * The dynamic portion of the hook, `$content_func`, refers to the form
* callback for the media upload type. Possible values include
* 'media_upload_type_form', 'media_upload_type_url_form', and
* 'media_upload_library_form'.
*
* @since 2.5.0
*
+ * @global int $post_ID
+ *
+ * @staticvar int $instance
+ *
* @param string $editor_id
*/
function media_buttons($editor_id = 'content') {
$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.
*/
echo $legacy_filter;
}
}
-add_action( 'media_buttons', 'media_buttons' );
+/**
+ *
+ * @global int $post_ID
+ * @param string $type
+ * @param int $post_id
+ * @param string $tab
+ * @return string
+ */
function get_upload_iframe_src( $type = null, $post_id = null, $tab = null ) {
global $post_ID;
$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
+ * The dynamic portion of the hook name, `$type`, refers to the type
* of media uploaded.
*
* @since 3.0.0
*
* @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
*
$errors = null;
if ( isset($_POST['send']) ) {
- $keys = array_keys($_POST['send']);
- $send_id = (int) array_shift($keys);
+ $keys = array_keys( $_POST['send'] );
+ $send_id = (int) reset( $keys );
}
if ( !empty($_POST['attachments']) ) foreach ( $_POST['attachments'] as $attachment_id => $attachment ) {
}
/**
- * 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 );
if ( isset($_POST['insert-gallery']) || isset($_POST['update-gallery']) ) { ?>
<script type="text/javascript">
- /* <![CDATA[ */
var win = window.dialogArguments || opener || parent || top;
win.tb_remove();
- /* ]]> */
</script>
<?php
exit;
}
/**
- * 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
*
}
/**
- * {@internal Missing Short Description}}
+ * Handles the process of uploading media.
*
* @since 2.5.0
*
- * @return mixed
+ * @return null|string
*/
function wp_media_upload_handler() {
$errors = array();
$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
+ * The dynamic portion of the hook name, `$type`, refers to the type
* of media being sent.
*
* @since 3.3.0
* @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'] ) );
$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
*
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();
}
/**
- * 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.
*
- * @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
- * @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). 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 ) {
+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] );
$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;
+ }
+
$alt = isset( $desc ) ? esc_attr( $desc ) : '';
$html = "<img src='$src' alt='$alt' />";
return $html;
+ } else {
+ return new WP_Error( 'image_sideload_failed' );
}
}
/**
- * {@internal Missing Short Description}}
+ * Retrieves the legacy media uploader form in an iframe.
*
* @since 2.5.0
*
- * @return unknown
+ * @return string|null
*/
function media_upload_gallery() {
$errors = array();
}
/**
- * {@internal Missing Short Description}}
+ * Retrieves the legacy media library form in an iframe.
*
* @since 2.5.0
*
- * @return unknown
+ * @return string|null
*/
function media_upload_library() {
$errors = array();
*
* @since 2.7.0
*
- * @param object $post
+ * @param WP_Post $post
* @param string $checked
* @return string
*/
*
* @since 2.7.0
*
- * @param object $post
+ * @param WP_Post $post
* @param bool|string $check
* @return array
*/
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
*
'full' => __( 'Full Size' )
) );
- if ( empty($check) )
- $check = get_user_setting('imgsize', 'medium');
-
- foreach ( $size_names as $size => $label ) {
- $downsize = image_downsize($post->ID, $size);
- $checked = '';
-
- // Is this size selectable?
- $enabled = ( $downsize[3] || 'full' == $size );
- $css_id = "image-size-{$size}-{$post->ID}";
-
- // If this size is the default but that's not available, don't select it.
- if ( $size == $check ) {
- if ( $enabled )
- $checked = " checked='checked'";
- else
- $check = '';
- } elseif ( !$check && $enabled && 'thumbnail' != $size ) {
- /*
- * If $check is not enabled, default to the first available size
- * that's bigger than a thumbnail.
- */
- $check = $size;
- $checked = " checked='checked'";
- }
+ if ( empty( $check ) ) {
+ $check = get_user_setting('imgsize', 'medium');
+ }
+ $out = array();
- $html = "<div class='image-size-item'><input type='radio' " . disabled( $enabled, false, false ) . "name='attachments[$post->ID][image-size]' id='{$css_id}' value='{$size}'$checked />";
+ foreach ( $size_names as $size => $label ) {
+ $downsize = image_downsize( $post->ID, $size );
+ $checked = '';
- $html .= "<label for='{$css_id}'>$label</label>";
+ // Is this size selectable?
+ $enabled = ( $downsize[3] || 'full' == $size );
+ $css_id = "image-size-{$size}-{$post->ID}";
- // Only show the dimensions if that choice is available.
- if ( $enabled )
- $html .= " <label for='{$css_id}' class='help'>" . sprintf( "(%d × %d)", $downsize[1], $downsize[2] ). "</label>";
+ // If this size is the default but that's not available, don't select it.
+ if ( $size == $check ) {
+ if ( $enabled ) {
+ $checked = " checked='checked'";
+ } else {
+ $check = '';
+ }
+ } elseif ( ! $check && $enabled && 'thumbnail' != $size ) {
+ /*
+ * If $check is not enabled, default to the first available size
+ * that's bigger than a thumbnail.
+ */
+ $check = $size;
+ $checked = " checked='checked'";
+ }
- $html .= '</div>';
+ $html = "<div class='image-size-item'><input type='radio' " . disabled( $enabled, false, false ) . "name='attachments[$post->ID][image-size]' id='{$css_id}' value='{$size}'$checked />";
- $out[] = $html;
+ $html .= "<label for='{$css_id}'>$label</label>";
+
+ // Only show the dimensions if that choice is available.
+ if ( $enabled ) {
+ $html .= " <label for='{$css_id}' class='help'>" . sprintf( "(%d × %d)", $downsize[1], $downsize[2] ). "</label>";
}
+ $html .= '</div>';
- return array(
- 'label' => __('Size'),
- 'input' => 'html',
- 'html' => join("\n", $out),
- );
+ $out[] = $html;
+ }
+
+ return array(
+ 'label' => __( 'Size' ),
+ 'input' => 'html',
+ 'html' => join( "\n", $out ),
+ );
}
/**
*
* @since 2.7.0
*
- * @param object $post
+ * @param WP_Post $post
* @param string $url_type
* @return string
*/
";
}
+/**
+ * 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]";
}
/**
- * {@internal Missing Short Description}}
+ * Retrieves the image attachment fields to edit form fields.
*
* @since 2.5.0
*
}
/**
- * {@internal Missing Short Description}}
+ * Retrieves the single non-image attachment fields to edit form fields.
*
* @since 2.5.0
*
}
/**
- * {@internal Missing Short Description}}
+ * Retrieves the post non-image attachment fields to edito form fields.
*
* @since 2.8.0
*
* 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
*
- * @param WP_Post $post The WP_Post attachment object.
- * @param array $attachment An array of attachment metadata.
+ * @param array $post The WP_Post attachment object converted to an array.
+ * @param array $attachment An array of attachment metadata.
* @return array Filtered attachment post object.
*/
function image_attachment_fields_to_save( $post, $attachment ) {
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
*
* @param string $html
* @param integer $attachment_id
* @param array $attachment
- * @return array
+ * @return string
*/
function image_media_send_to_editor($html, $attachment_id, $attachment) {
$post = get_post($attachment_id);
$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);
}
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
*
- * @param object $post
+ * @param WP_Post $post
* @param array $errors
* @return array
*/
}
// 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().
}
/**
- * Filter the attachment fields to edit.
+ * Filters the attachment fields to edit.
*
* @since 2.5.0
*
*
* @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
*
* @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.
$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
*
$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();
$keys = array_keys( wp_match_mime_types( array_keys( $post_mime_types ), $post->post_mime_type ) );
- $type = array_shift( $keys );
+ $type = reset( $keys );
$type_html = "<input type='hidden' id='type-of-$attachment_id' value='" . esc_attr( $type ) . "' />";
$form_fields = get_attachment_fields_to_edit( $post, $r['errors'] );
$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
*
<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";
$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',
);
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'];
$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>";
}
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'] ) ) {
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' ) {
$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>';
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 );
}
// 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 */
}
$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' : '';
// 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>';
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";
}
/**
- * {@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();
}
/**
- * {@internal Missing Short Description}}
+ * Outputs the legacy media upload form.
*
* @since 2.5.0
*
- * @param unknown_type $errors
+ * @global string $type
+ * @global string $tab
+ * @global bool $is_IE
+ * @global bool $is_opera
+ *
+ * @param array $errors
*/
function media_upload_form( $errors = null ) {
global $type, $tab, $is_IE, $is_opera;
if ( ! _device_can_upload() ) {
- echo '<p>' . sprintf( __('The web browser on your device cannot be used to upload files. You may be able to use the <a href="%s">native app for your device</a> instead.'), 'http://apps.wordpress.org/' ) . '</p>';
+ echo '<p>' . sprintf( __('The web browser on your device cannot be used to upload files. You may be able to use the <a href="%s">native app for your device</a> instead.'), 'https://apps.wordpress.org/' ) . '</p>';
return;
}
);
/**
- * Filter the media upload post parameters.
+ * Filters the media upload post parameters.
*
* @since 3.1.0 As 'swfupload_post_params'
* @since 3.3.0
'multipart_params' => $post_params,
);
+// Currently only iOS Safari supports multiple files uploading but iOS 7.x has a bug that prevents uploading of videos
+// when enabled. See #29602.
+if ( wp_is_mobile() && strpos( $_SERVER['HTTP_USER_AGENT'], 'OS 7_' ) !== false &&
+ strpos( $_SERVER['HTTP_USER_AGENT'], 'like Mac OS X' ) !== false ) {
+
+ $plupload_init['multi_selection'] = false;
+}
+
/**
- * Filter the default Plupload settings.
+ * Filters the default Plupload settings.
*
* @since 3.3.0
*
$large_size_w = 1024;
?>
var resize_height = <?php echo $large_size_h; ?>, resize_width = <?php echo $large_size_w; ?>,
-wpUploaderInit = <?php echo json_encode($plupload_init); ?>;
+wpUploaderInit = <?php echo wp_json_encode( $plupload_init ); ?>;
</script>
<div id="plupload-upload-ui" class="hide-if-no-js">
<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>
}
/**
- * {@internal Missing Short Description}}
+ * Outputs the legacy media upload form for a given media type.
*
* @since 2.5.0
*
$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
*
<?php media_upload_form( $errors ); ?>
<script type="text/javascript">
-//<![CDATA[
jQuery(function($){
var preloaded = $(".media-item.preloaded");
if ( preloaded.length > 0 ) {
}
updateMediaForm();
});
-//]]>
</script>
<div id="media-items"><?php
?></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
*
<h3 class="media-title"><?php _e('Insert media from another website'); ?></h3>
<script type="text/javascript">
-//<![CDATA[
var addExtImage = {
width : '',
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="" />';
},
return false;
}
- document.getElementById('status_img').innerHTML = '<img src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" width="16" />';
+ document.getElementById('status_img').innerHTML = '<img src="<?php echo esc_url( admin_url( 'images/spinner-2x.gif' ) ); ?>" alt="" width="16" height="16" />';
t.preloadImg = new Image();
t.preloadImg.onload = t.updateImageData;
t.preloadImg.onerror = t.resetImageData;
t.preloadImg.src = src;
}
-}
+};
jQuery(document).ready( function($) {
$('.media-types input').click( function() {
$('table.describe').toggleClass('not-image', $('#not-image').prop('checked') );
});
});
-
-//]]>
</script>
<div id="media-items">
<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
*
*
* @since 2.5.0
*
+ * @global string $redir_tab
+ * @global string $type
+ * @global string $tab
+ *
* @param array $errors
*/
function media_upload_gallery_form($errors) {
</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'] ); ?>" />
}
/**
- * {@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) {
?>
-<form id="filter" action="" method="get">
+<form id="filter" method="get">
<input type="hidden" name="type" value="<?php echo esc_attr( $type ); ?>" />
<input type="hidden" name="tab" value="<?php echo esc_attr( $tab ); ?>" />
<input type="hidden" name="post_id" value="<?php echo (int) $post_id; ?>" />
<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">
$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.
+ * Returned values should begin with an `<li>` tag.
*
* @since 3.1.0
*
</select>
<?php } ?>
-<?php submit_button( __( 'Filter »' ), 'button', 'post-query-submit', false ); ?>
+<?php submit_button( __( 'Filter »' ), '', 'post-query-submit', false ); ?>
</div>
<?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>
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>
<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>
* 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' );
</p>
<?php
}
-add_action('post-plupload-upload-ui', 'media_upload_flash_bypass');
/**
* Displays the browser's built-in uploader message.
</p>
<?php
}
-add_action('post-html-upload-ui', 'media_upload_html_bypass');
/**
* Used to display a "After a file has been uploaded..." help message.
* 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'] );
$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 = '';
<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>
<?php if ( $open ) wp_image_editor( $attachment_id ); ?>
</div>
<?php
- elseif ( $attachment_id && 0 === strpos( $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 );
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">
);
?>
- <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>
}
/**
- * 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 );
$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>
</div>
<?php
- $file = get_attached_file( $post->ID );
$file_size = false;
if ( isset( $meta['filesize'] ) )
if ( preg_match( '#^(audio|video)/#', $post->post_mime_type ) ) {
/**
- * 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.
}
/**
- * 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.
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
*
foreach ( array( 'id3v2', 'id3v1' ) as $version ) {
if ( ! empty( $data[$version]['comments'] ) ) {
foreach ( $data[$version]['comments'] as $key => $list ) {
- if ( ! empty( $list ) ) {
+ if ( 'length' !== $key && ! empty( $list ) ) {
$metadata[$key] = reset( $list );
// Fix bug in byte stream analysis.
if ( 'terms_of_use' === $key && 0 === strpos( $metadata[$key], 'yright notice.' ) )
* @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 );
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'] ) )
* @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 );
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'];
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( __( 'Sorry, 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;
+ }
+}
scripts.mit.edu / autoinstalls / wordpress.git / blobdiff