X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/0461a5f2e55c8d5f1fde96ca2e83117152573c7d..9e77185fafaf4e60e2b73821e0e4b9b1a11fb85f:/wp-admin/includes/media.php diff --git a/wp-admin/includes/media.php b/wp-admin/includes/media.php index 06cd1c12..8a5e6cc5 100644 --- a/wp-admin/includes/media.php +++ b/wp-admin/includes/media.php @@ -180,7 +180,8 @@ function image_add_caption( $html, $id, $caption, $title, $align, $url, $size, $ $caption = str_replace( array("\r\n", "\r"), "\n", $caption); $caption = preg_replace_callback( '/<[a-zA-Z0-9]+(?: [^<>]+>)*/', '_cleanup_image_add_caption', $caption ); - // convert any remaining line breaks to
+ + // Convert any remaining line breaks to
. $caption = preg_replace( '/[ \n\t]*\n[ \t]*/', '
', $caption ); $html = preg_replace( '/(class=["\'][^\'"]*)align(none|left|right|center)\s?/', '$1', $html ); @@ -208,7 +209,7 @@ add_filter( 'image_send_to_editor', 'image_add_caption', 20, 8 ); * @since 3.4.0 */ function _cleanup_image_add_caption( $matches ) { - // remove any line breaks from inside the tags + // Remove any line breaks from inside the tags. return preg_replace( '/[\r\n\t]+/', ' ', $matches[0] ); } @@ -317,7 +318,7 @@ function media_handle_upload($file_id, $post_id, $post_data = array(), $override if ( ! empty( $meta['genre'] ) ) $content .= ' ' . sprintf( __( 'Genre: %s.' ), $meta['genre'] ); - // use image exif/iptc data for title and caption defaults if possible + // 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'] ) ) ) $title = $image_meta['title']; @@ -378,7 +379,7 @@ function media_handle_sideload($file_array, $post_id, $desc = null, $post_data = $title = preg_replace('/\.[^.]+$/', '', basename($file)); $content = ''; - // use image exif/iptc data for title and caption defaults if possible + // Use image exif/iptc data for title and caption defaults if possible. if ( $image_meta = @wp_read_image_metadata($file) ) { if ( trim( $image_meta['title'] ) && ! is_numeric( sanitize_title( $image_meta['title'] ) ) ) $title = $image_meta['title']; @@ -389,7 +390,7 @@ function media_handle_sideload($file_array, $post_id, $desc = null, $post_data = if ( isset( $desc ) ) $title = $desc; - // Construct the attachment array + // Construct the attachment array. $attachment = array_merge( array( 'post_mime_type' => $type, 'guid' => $url, @@ -514,6 +515,9 @@ document.body.className = document.body.className.replace('no-js', 'js'); * @param string $editor_id */ function media_buttons($editor_id = 'content') { + static $instance = 0; + $instance++; + $post = get_post(); if ( ! $post && ! empty( $GLOBALS['post_ID'] ) ) $post = $GLOBALS['post_ID']; @@ -524,8 +528,13 @@ function media_buttons($editor_id = 'content') { $img = ' '; - echo '' . $img . __( 'Add Media' ) . ''; - + $id_attribute = $instance === 1 ? ' id="insert-media-button"' : ''; + printf( '%s', + $id_attribute, + esc_attr( $editor_id ), + esc_attr__( 'Add Media' ), + $img . __( 'Add Media' ) + ); /** * Filter the legacy (pre-3.5.0) media buttons. * @@ -627,7 +636,8 @@ function media_upload_form_handler() { $image_alt = wp_unslash( $attachment['image_alt'] ); if ( $image_alt != get_post_meta($attachment_id, '_wp_attachment_image_alt', true) ) { $image_alt = wp_strip_all_tags( $image_alt, true ); - // update_meta expects slashed + + // Update_meta expects slashed. update_post_meta( $attachment_id, '_wp_attachment_image_alt', wp_slash( $image_alt ) ); } } @@ -766,7 +776,10 @@ function wp_media_upload_handler() { return media_send_to_editor($html); } - if ( !empty($_POST) ) { + if ( isset( $_POST['save'] ) ) { + $errors['upload_notice'] = __('Saved.'); + return media_upload_gallery(); + } elseif ( ! empty( $_POST ) ) { $return = media_upload_form_handler(); if ( is_string($return) ) @@ -775,11 +788,6 @@ function wp_media_upload_handler() { $errors = $return; } - if ( isset($_POST['save']) ) { - $errors['upload_notice'] = __('Saved.'); - return media_upload_gallery(); - } - if ( isset($_GET['tab']) && $_GET['tab'] == 'type_url' ) { $type = 'image'; if ( isset( $_GET['type'] ) && in_array( $_GET['type'], array( 'video', 'audio', 'file' ) ) ) @@ -800,37 +808,36 @@ function wp_media_upload_handler() { * @param string $desc Optional. Description of the image * @return string|WP_Error Populated HTML img tag on success */ -function media_sideload_image($file, $post_id, $desc = null) { - if ( ! empty($file) ) { - // Download file to temp location - $tmp = download_url( $file ); - - // Set variables for storage - // fix file filename for query strings +function media_sideload_image( $file, $post_id, $desc = null ) { + if ( ! empty( $file ) ) { + // Set variables for storage, fix file filename for query strings. preg_match( '/[^\?]+\.(jpe?g|jpe|gif|png)\b/i', $file, $matches ); - $file_array['name'] = basename($matches[0]); - $file_array['tmp_name'] = $tmp; + $file_array = array(); + $file_array['name'] = basename( $matches[0] ); + + // Download file to temp location. + $file_array['tmp_name'] = download_url( $file ); - // If error storing temporarily, unlink - if ( is_wp_error( $tmp ) ) { - @unlink($file_array['tmp_name']); - $file_array['tmp_name'] = ''; + // If error storing temporarily, return the error. + if ( is_wp_error( $file_array['tmp_name'] ) ) { + return $file_array['tmp_name']; } - // do the validation and storage stuff + // Do the validation and storage stuff. $id = media_handle_sideload( $file_array, $post_id, $desc ); - // If error storing permanently, unlink - if ( is_wp_error($id) ) { - @unlink($file_array['tmp_name']); + + // If error storing permanently, unlink. + if ( is_wp_error( $id ) ) { + @unlink( $file_array['tmp_name'] ); return $id; } $src = wp_get_attachment_url( $id ); } - // Finally check to make sure the file has been saved, then return the html - if ( ! empty($src) ) { - $alt = isset($desc) ? esc_attr($desc) : ''; + // Finally check to make sure the file has been saved, then return the HTML. + if ( ! empty( $src ) ) { + $alt = isset( $desc ) ? esc_attr( $desc ) : ''; $html = "$alt"; return $html; } @@ -941,17 +948,21 @@ function image_size_input_fields( $post, $check = '' ) { $downsize = image_downsize($post->ID, $size); $checked = ''; - // is this size selectable? + // 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 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 + /* + * If $check is not enabled, default to the first available size + * that's bigger than a thumbnail. + */ $check = $size; $checked = " checked='checked'"; } @@ -959,7 +970,8 @@ function image_size_input_fields( $post, $check = '' ) { $html = "
"; $html .= ""; - // only show the dimensions if that choice is available + + // Only show the dimensions if that choice is available. if ( $enabled ) $html .= " "; @@ -1007,7 +1019,7 @@ function image_link_input_fields($post, $url_type = '') { } function wp_caption_input_textarea($edit_post) { - // post data is already escaped + // Post data is already escaped. $name = "attachments[{$edit_post->ID}][post_excerpt]"; return ''; @@ -1031,9 +1043,9 @@ function image_attachment_fields_to_edit($form_fields, $post) { * * @since 2.5.0 * - * @param array $form_fields - * @param object $post {@internal $post not used}} - * @return array + * @param array $form_fields An array of attachment form fields. + * @param WP_Post $post The WP_Post attachment object. + * @return array Filtered attachment form fields. */ function media_single_attachment_fields_to_edit( $form_fields, $post ) { unset($form_fields['url'], $form_fields['align'], $form_fields['image-size']); @@ -1045,9 +1057,9 @@ function media_single_attachment_fields_to_edit( $form_fields, $post ) { * * @since 2.8.0 * - * @param array $form_fields - * @param object $post {@internal $post not used}} - * @return array + * @param array $form_fields An array of attachment form fields. + * @param WP_Post $post The WP_Post attachment object. + * @return array Filtered attachment form fields. */ function media_post_single_attachment_fields_to_edit( $form_fields, $post ) { unset($form_fields['image_url']); @@ -1063,9 +1075,9 @@ function media_post_single_attachment_fields_to_edit( $form_fields, $post ) { * * @since 2.5.0 * - * @param object $post - * @param array $attachment {@internal $attachment not used}} - * @return array + * @param WP_Post $post The WP_Post attachment object. + * @param array $attachment An array of attachment metadata. + * @return array Filtered attachment post object. */ function image_attachment_fields_to_save( $post, $attachment ) { if ( substr( $post['post_mime_type'], 0, 5 ) == 'image' ) { @@ -1285,7 +1297,13 @@ function get_media_item( $attachment_id, $args = null ) { $post = get_post( $attachment_id ); $current_post_id = !empty( $_GET['post_id'] ) ? (int) $_GET['post_id'] : 0; - $default_args = array( 'errors' => null, 'send' => $current_post_id ? post_type_supports( get_post_type( $current_post_id ), 'editor' ) : true, 'delete' => true, 'toggle' => true, 'show_title' => true ); + $default_args = array( + 'errors' => null, + 'send' => $current_post_id ? post_type_supports( get_post_type( $current_post_id ), 'editor' ) : true, + 'delete' => true, + 'toggle' => true, + 'show_title' => true + ); $args = wp_parse_args( $args, $default_args ); /** @@ -1297,8 +1315,7 @@ function get_media_item( $attachment_id, $args = null ) { * * @param array $args An array of arguments. */ - $args = apply_filters( 'get_media_item_args', $args ); - extract( $args, EXTR_SKIP ); + $r = apply_filters( 'get_media_item_args', $args ); $toggle_on = __( 'Show' ); $toggle_off = __( 'Hide' ); @@ -1306,21 +1323,15 @@ function get_media_item( $attachment_id, $args = null ) { $filename = esc_html( wp_basename( $post->guid ) ); $title = esc_attr( $post->post_title ); - if ( $_tags = get_the_tags( $attachment_id ) ) { - foreach ( $_tags as $tag ) - $tags[] = $tag->name; - $tags = esc_attr( join( ', ', $tags ) ); - } - $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_html = ""; - $form_fields = get_attachment_fields_to_edit( $post, $errors ); + $form_fields = get_attachment_fields_to_edit( $post, $r['errors'] ); - if ( $toggle ) { - $class = empty( $errors ) ? 'startclosed' : 'startopen'; + if ( $r['toggle'] ) { + $class = empty( $r['errors'] ) ? 'startclosed' : 'startopen'; $toggle_links = " $toggle_on $toggle_off"; @@ -1330,7 +1341,7 @@ function get_media_item( $attachment_id, $args = null ) { } $display_title = ( !empty( $title ) ) ? $title : $filename; // $title shouldn't ever be empty, but just in case - $display_title = $show_title ? "
" . wp_html_excerpt( $display_title, 60, '…' ) . "
" : ''; + $display_title = $r['show_title'] ? "
" . wp_html_excerpt( $display_title, 60, '…' ) . "
" : ''; $gallery = ( ( isset( $_REQUEST['tab'] ) && 'gallery' == $_REQUEST['tab'] ) || ( isset( $redir_tab ) && 'gallery' == $redir_tab ) ); $order = ''; @@ -1404,8 +1415,11 @@ function get_media_item( $attachment_id, $args = null ) { 'extra_rows' => array(), ); - if ( $send ) - $send = get_submit_button( __( 'Insert into Post' ), 'button', "send[$attachment_id]", false ); + if ( $r['send'] ) { + $r['send'] = get_submit_button( __( 'Insert into Post' ), 'button', "send[$attachment_id]", false ); + } + + $delete = empty( $r['delete'] ) ? '' : $r['delete']; if ( $delete && current_user_can( 'delete_post', $attachment_id ) ) { if ( !EMPTY_TRASH_DAYS ) { $delete = "" . __( 'Delete Permanently' ) . ''; @@ -1425,19 +1439,20 @@ function get_media_item( $attachment_id, $args = null ) { $thumbnail = ''; $calling_post_id = 0; - if ( isset( $_GET['post_id'] ) ) + if ( isset( $_GET['post_id'] ) ) { $calling_post_id = absint( $_GET['post_id'] ); - elseif ( isset( $_POST ) && count( $_POST ) ) // Like for async-upload where $_GET['post_id'] isn't set + } elseif ( isset( $_POST ) && count( $_POST ) ) {// Like for async-upload where $_GET['post_id'] isn't set $calling_post_id = $post->post_parent; + } 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 ) { $ajax_nonce = wp_create_nonce( "set_post_thumbnail-$calling_post_id" ); $thumbnail = "" . esc_html__( "Use as featured image" ) . ""; } - if ( ( $send || $thumbnail || $delete ) && !isset( $form_fields['buttons'] ) ) - $form_fields['buttons'] = array( 'tr' => "\t\t$send $thumbnail $delete\n" ); - + if ( ( $r['send'] || $thumbnail || $delete ) && !isset( $form_fields['buttons'] ) ) { + $form_fields['buttons'] = array( 'tr' => "\t\t" . $r['send'] . " $thumbnail $delete\n" ); + } $hidden_fields = array(); foreach ( $form_fields as $id => $field ) { @@ -1467,10 +1482,10 @@ function get_media_item( $attachment_id, $args = null ) { $item .= $field[ $field['input'] ]; elseif ( $field['input'] == 'textarea' ) { if ( 'post_content' == $id && user_can_richedit() ) { - // sanitize_post() skips the post_content when user_can_richedit + // Sanitize_post() skips the post_content when user_can_richedit. $field['value'] = htmlspecialchars( $field['value'], ENT_QUOTES ); } - // post_excerpt is already escaped by sanitize_post() in get_attachment_fields_to_edit() + // Post_excerpt is already escaped by sanitize_post() in get_attachment_fields_to_edit(). $item .= "'; } else { $item .= ""; @@ -1616,7 +1631,7 @@ function get_compat_media_markup( $attachment_id, $args = null ) { $item .= $field[ $field['input'] ]; elseif ( $field['input'] == 'textarea' ) { if ( 'post_content' == $id && user_can_richedit() ) { - // sanitize_post() skips the post_content when user_can_richedit + // sanitize_post() skips the post_content when user_can_richedit. $field['value'] = htmlspecialchars( $field['value'], ENT_QUOTES ); } $item .= "'; @@ -1687,7 +1702,7 @@ function media_upload_form( $errors = null ) { global $type, $tab, $is_IE, $is_opera; if ( ! _device_can_upload() ) { - echo '

' . sprintf( __('The web browser on your device cannot be used to upload files. You may be able to use the native app for your device instead.'), 'https://wordpress.org/mobile/' ) . '

'; + echo '

' . sprintf( __('The web browser on your device cannot be used to upload files. You may be able to use the native app for your device instead.'), 'http://apps.wordpress.org/' ) . '

'; return; } @@ -1696,18 +1711,9 @@ function media_upload_form( $errors = null ) { $_type = isset($type) ? $type : ''; $_tab = isset($tab) ? $tab : ''; - $upload_size_unit = $max_upload_size = wp_max_upload_size(); - $sizes = array( 'KB', 'MB', 'GB' ); - - for ( $u = -1; $upload_size_unit > 1024 && $u < count( $sizes ) - 1; $u++ ) { - $upload_size_unit /= 1024; - } - - if ( $u < 0 ) { - $upload_size_unit = 0; - $u = 0; - } else { - $upload_size_unit = (int) $upload_size_unit; + $max_upload_size = wp_max_upload_size(); + if ( ! $max_upload_size ) { + $max_upload_size = 0; } ?> @@ -1742,11 +1748,11 @@ if ( is_multisite() && !is_upload_space_available() ) { do_action( 'pre-upload-ui' ); $post_params = array( - "post_id" => $post_id, - "_wpnonce" => wp_create_nonce('media-form'), - "type" => $_type, - "tab" => $_tab, - "short" => "1", + "post_id" => $post_id, + "_wpnonce" => wp_create_nonce('media-form'), + "type" => $_type, + "tab" => $_tab, + "short" => "1", ); /** @@ -1774,11 +1780,6 @@ $plupload_init = array( 'multipart_params' => $post_params, ); -// Multi-file uploading doesn't currently work in iOS Safari, -// single-file allows the built-in camera to be used as source for images -if ( wp_is_mobile() ) - $plupload_init['multi_selection'] = false; - /** * Filter the default Plupload settings. * @@ -1856,7 +1857,7 @@ do_action( 'post-html-upload-ui' ); ?>
- +

@@ -2303,7 +2302,7 @@ if ( empty($_GET['post_mime_type']) || $_GET['post_mime_type'] == 'all' ) $class = ' class="current"'; else $class = ''; -$type_links[] = "
  • 'all', 'paged'=>false, 'm'=>false))) . "'$class>".__('All Types').""; +$type_links[] = '
  • ' . __('All Types') . ''; foreach ( $post_mime_types as $mime_type => $label ) { $class = ''; @@ -2313,7 +2312,7 @@ foreach ( $post_mime_types as $mime_type => $label ) { if ( isset($_GET['post_mime_type']) && wp_match_mime_types($mime_type, $_GET['post_mime_type']) ) $class = ' class="current"'; - $type_links[] = "
  • $mime_type, 'paged'=>false))) . "'$class>" . sprintf( translate_nooped_plural( $label[2], $num_posts[$mime_type] ), "" . number_format_i18n( $num_posts[$mime_type] ) . '') . ''; + $type_links[] = '
  • ' . sprintf( translate_nooped_plural( $label[2], $num_posts[$mime_type] ), '' . number_format_i18n( $num_posts[$mime_type] ) . '') . ''; } /** * Filter the media upload mime type list items. @@ -2607,8 +2606,6 @@ function edit_form_image_editor( $post ) { if ( $attachment_id = intval( $post->ID ) ) $thumb_url = wp_get_attachment_image_src( $attachment_id, array( 900, 450 ), true ); - $filename = esc_html( basename( $post->guid ) ); - $title = esc_attr( $post->post_title ); $alt_text = get_post_meta( $post->ID, '_wp_attachment_image_alt', true ); $att_url = wp_get_attachment_url( $post->ID ); ?> @@ -2655,6 +2652,11 @@ function edit_form_image_editor( $post ) { $attr['height'] = $h; } + $thumb_id = get_post_thumbnail_id( $attachment_id ); + if ( ! empty( $thumb_id ) ) { + $attr['poster'] = wp_get_attachment_url( $thumb_id ); + } + echo wp_video_shortcode( $attr ); endif; ?> @@ -2860,7 +2862,7 @@ function wp_add_id3_tag_data( &$metadata, $data ) { foreach ( $data[$version]['comments'] as $key => $list ) { if ( ! empty( $list ) ) { $metadata[$key] = reset( $list ); - // fix bug in byte stream analysis + // Fix bug in byte stream analysis. if ( 'terms_of_use' === $key && 0 === strpos( $metadata[$key], 'yright notice.' ) ) $metadata[$key] = 'Cop' . $metadata[$key]; }