enmi-conf.org: comparison wp/wp-admin/includes/media.php

equal deleted inserted replaced

-:be944660c56a
+:3d72ae0968f4
 * @package WordPress
 * @subpackage Administration
 */
 /**
-* Defines the default media upload tabs
+* Defines the default media upload tabs.
 *
 * @since 2.5.0
 *
 * @return string[] Default tabs.
 */
 	 */
 	return apply_filters( 'media_upload_tabs', $_default_tabs );
 }
 /**
-* Adds the gallery tab back to the tabs array if post has image attachments
+* Adds the gallery tab back to the tabs array if post has image attachments.
 *
 * @since 2.5.0
 *
 * @global wpdb $wpdb WordPress database abstraction object.
 *
 /**
 * Saves a file submitted from a POST request and create an attachment post for it.
 *
 * @since 2.5.0
 *
-* @param string $file_id   Index of the `$_FILES` array that the file was sent. Required.
+* @param string $file_id   Index of the `$_FILES` array that the file was sent.
 * @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 Optional. Overwrite some of the attachment.
 * @param array  $overrides Optional. Override the wp_handle_upload() behavior.
 * @return int|WP_Error ID of the attachment or a WP_Error object on failure.
 		}
 		if ( ! empty( $meta['track_number'] ) ) {
 			$track_number = explode( '/', $meta['track_number'] );
-			if ( isset( $track_number[1] ) ) {
+			if ( is_numeric( $track_number[0] ) ) {
-				/* translators: Audio file track information. 1: Audio track number, 2: Total audio tracks. */
+				if ( isset( $track_number[1] ) && is_numeric( $track_number[1] ) ) {
-				$content .= ' ' . sprintf( __( 'Track %1$s of %2$s.' ), number_format_i18n( $track_number[0] ), number_format_i18n( $track_number[1] ) );
+					$content .= ' ' . sprintf(
-			} else {
+						/* translators: Audio file track information. 1: Audio track number, 2: Total audio tracks. */
-				/* translators: Audio file track information. %s: Audio track number. */
+						__( 'Track %1$s of %2$s.' ),
-				$content .= ' ' . sprintf( __( 'Track %s.' ), number_format_i18n( $track_number[0] ) );
+						number_format_i18n( $track_number[0] ),
+						number_format_i18n( $track_number[1] )
+					);
+				} else {
+					$content .= ' ' . sprintf(
+						/* translators: Audio file track information. %s: Audio track number. */
+						__( 'Track %s.' ),
+						number_format_i18n( $track_number[0] )
+					);
+				}
 			}
 		}
 		if ( ! empty( $meta['genre'] ) ) {
 			/* translators: Audio file genre information. %s: Audio genre name. */
 		wp_enqueue_style( 'deprecated-media' );
 	}
 	?>
 	<script type="text/javascript">
-	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();}}};
+	addLoadEvent = function(func){if(typeof jQuery!=='undefined')jQuery(function(){func();});else if(typeof wpOnload!=='function'){wpOnload=func;}else{var oldonload=wpOnload;wpOnload=function(){oldonload();func();}}};
 	var ajaxurl = '<?php echo esc_js( 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 */
 	if ( is_string( $content_func ) ) {
 		/**
 		 * 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 name, `$content_func`, refers to the form
-		 * callback for the media upload type. Possible values include
+		 * callback for the media upload type.
-		 * 'media_upload_type_form', 'media_upload_type_url_form', and
-		 * 'media_upload_library_form'.
 		 *
 		 * @since 2.5.0
 		 */
 		do_action( "admin_head_{$content_func}" );
 	}
 	</html>
 	<?php
 }
 /**
-* Adds the media button to the editor
+* Adds the media button to the editor.
 *
 * @since 2.5.0
 *
 * @global int $post_ID
 *
 /**
 * Handles form submissions for the legacy media uploader.
 *
 * @since 2.5.0
 *
-* @return mixed void|object WP_Error on failure
+* @return null|array|void Array of error messages keyed by attachment ID, null or void on success.
 */
 function media_upload_form_handler() {
 	check_admin_referer( 'media-form' );
 	$errors = null;
 /**
 * Downloads an image from the specified URL, saves it as an attachment, and optionally attaches it to a post.
 *
 * @since 2.6.0
-* @since 4.2.0 Introduced the `$return` parameter.
+* @since 4.2.0 Introduced the `$return_type` parameter.
-* @since 4.8.0 Introduced the 'id' option for the `$return` parameter.
+* @since 4.8.0 Introduced the 'id' option for the `$return_type` parameter.
 * @since 5.3.0 The `$post_id` parameter was made optional.
 * @since 5.4.0 The original URL of the attachment is stored in the `_source_url`
 *              post meta value.
 *
-* @param string $file    The URL of the image to download.
+* @param string $file        The URL of the image to download.
-* @param int    $post_id Optional. The post ID the media is to be associated with.
+* @param int    $post_id     Optional. The post ID the media is to be associated with.
-* @param string $desc    Optional. Description of the image.
+* @param string $desc        Optional. Description of the image.
-* @param string $return  Optional. Accepts 'html' (image tag html) or 'src' (URL),
+* @param string $return_type Optional. Accepts 'html' (image tag html) or 'src' (URL),
-*                        or 'id' (attachment ID). Default 'html'.
+*                            or 'id' (attachment ID). Default 'html'.
 * @return string|int|WP_Error Populated HTML img tag, attachment ID, or attachment source
 *                             on success, WP_Error object otherwise.
 */
-function media_sideload_image( $file, $post_id = 0, $desc = null, $return = 'html' ) {
+function media_sideload_image( $file, $post_id = 0, $desc = null, $return_type = 'html' ) {
 	if ( ! empty( $file ) ) {
 		$allowed_extensions = array( 'jpg', 'jpeg', 'jpe', 'png', 'gif', 'webp' );
 		/**
 		// Store the original attachment source in meta.
 		add_post_meta( $id, '_source_url', $file );
 		// If attachment ID was requested, return it.
-		if ( 'id' === $return ) {
+		if ( 'id' === $return_type ) {
 			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 ) ) {
-		if ( 'src' === $return ) {
+		if ( 'src' === $return_type ) {
 			return $src;
 		}
 		$alt  = isset( $desc ) ? esc_attr( $desc ) : '';
 		$html = "<img src='$src' alt='$alt' />";
 	return wp_iframe( 'media_upload_library_form', $errors );
 }
 /**
-* Retrieve HTML for the image alignment radio buttons with the specified one checked.
+* Retrieves HTML for the image alignment radio buttons with the specified one checked.
 *
 * @since 2.7.0
 *
 * @param WP_Post $post
 * @param string  $checked
 	return implode( "\n", $out );
 }
 /**
-* Retrieve HTML for the size radio buttons with the specified one checked.
+* Retrieves HTML for the size radio buttons with the specified one checked.
 *
 * @since 2.7.0
 *
 * @param WP_Post     $post
 * @param bool|string $check
 		'html'  => implode( "\n", $out ),
 	);
 }
 /**
-* Retrieve HTML for the Link URL buttons with the default link type as specified.
+* Retrieves HTML for the Link URL buttons with the default link type as specified.
 *
 * @since 2.7.0
 *
 * @param WP_Post $post
 * @param string  $url_type
 	<button type='button' class='button urlpost' data-link-url='" . esc_attr( $link ) . "'>" . __( 'Attachment Post URL' ) . '</button>
 ';
 }
 /**
-* Output a textarea element for inputting an attachment caption.
+* Outputs 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.
 * @return array Filtered attachment form fields.
 */
 function media_post_single_attachment_fields_to_edit( $form_fields, $post ) {
 	unset( $form_fields['image_url'] );
 	return $form_fields;
-}
-/**
-* 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 {@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 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 ) {
-	if ( 'image' === substr( $post['post_mime_type'], 0, 5 ) ) {
-		if ( strlen( trim( $post['post_title'] ) ) == 0 ) {
-			$attachment_url                           = ( isset( $post['attachment_url'] ) ) ? $post['attachment_url'] : $post['guid'];
-			$post['post_title']                       = preg_replace( '/\.\w+$/', '', wp_basename( $attachment_url ) );
-			$post['errors']['post_title']['errors'][] = __( 'Empty Title filled from filename.' );
-		}
-	}
-	return $post;
 }
 /**
 * Retrieves the media element HTML to send to the editor.
 *
 	return $form_fields;
 }
 /**
-* Retrieve HTML for media items of post gallery.
+* Retrieves HTML for media items of post gallery.
 *
 * The HTML markup retrieved will be created for the progress of SWF Upload
 * component. Will also create link for showing and hiding the form to modify
 * the image attachment.
 *
 * @since 2.5.0
 *
 * @global WP_Query $wp_the_query WordPress Query object.
 *
-* @param int   $post_id Optional. Post ID.
+* @param int   $post_id Post ID.
 * @param array $errors  Errors for attachment, if any.
-* @return string
+* @return string HTML content for media items of post gallery.
 */
 function get_media_items( $post_id, $errors ) {
 	$attachments = array();
 	if ( $post_id ) {
 	return $output;
 }
 /**
-* Retrieve HTML form for modifying the image attachment.
+* Retrieves HTML form for modifying the image attachment.
 *
 * @since 2.5.0
 *
 * @global string $redir_tab
 *
 		t.preloadImg.onerror = t.resetImageData;
 		t.preloadImg.src = src;
 	}
 	};
-	jQuery(document).ready( function($) {
+	jQuery( 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
 	</form>
 	<?php
 }
 /**
-* Adds gallery form to upload iframe
+* Adds gallery form to upload iframe.
 *
 * @since 2.5.0
 *
 * @global string $redir_tab
 * @global string $type
 	<a href="#" id="desc"><?php _e( 'Descending' ); ?></a> |
 	<a href="#" id="clear"><?php _ex( 'Clear', 'verb' ); ?></a>
 	</div>
 	<form enctype="multipart/form-data" method="post" action="<?php echo esc_url( $form_action_url ); ?>" class="<?php echo $form_class; ?>" id="gallery-form">
 		<?php wp_nonce_field( 'media-form' ); ?>
-		<?php // media_upload_form( $errors ); ?>
 	<table class="widefat">
 	<thead><tr>
 	<th><?php _e( 'Media' ); ?></th>
 	<th class="order-head"><?php _e( 'Order' ); ?></th>
 	<th class="actions-head"><?php _e( 'Actions' ); ?></th>
 	</div>
 	</form>
 	<form enctype="multipart/form-data" method="post" action="<?php echo esc_url( $form_action_url ); ?>" class="<?php echo $form_class; ?>" id="library-form">
 	<?php wp_nonce_field( 'media-form' ); ?>
-	<?php // media_upload_form( $errors ); ?>
 	<script type="text/javascript">
 	jQuery(function($){
 		var preloaded = $(".media-item.preloaded");
 		if ( preloaded.length > 0 ) {
 	</form>
 	<?php
 }
 /**
-* Creates the form for external url
+* Creates the form for external url.
 *
 * @since 2.7.0
 *
 * @param string $default_view
-* @return string the form html
+* @return string HTML content of the form.
 */
 function wp_media_insert_url_form( $default_view = 'image' ) {
 	/** This filter is documented in wp-admin/includes/media.php */
 	if ( ! apply_filters( 'disable_captions', '' ) ) {
 		$caption = '
 		<p class="attachment-alt-text-description" id="alt-text-description">
 		<?php
 		printf(
 			/* translators: 1: Link to tutorial, 2: Additional link attributes, 3: Accessibility text. */
-			__( '<a href="%1$s" %2$s>Describe the purpose of the image%3$s</a>. Leave empty if the image is purely decorative.' ),
+			__( '<a href="%1$s" %2$s>Learn how to describe the purpose of the image%3$s</a>. Leave empty if the image is purely decorative.' ),
 			esc_url( 'https://www.w3.org/WAI/tutorials/images/decision-tree' ),
 			'target="_blank" rel="noopener"',
 			sprintf(
 				'<span class="screen-reader-text"> %s</span>',
 				/* translators: Accessibility text. */
 	$file_size = false;
 	if ( isset( $meta['filesize'] ) ) {
 		$file_size = $meta['filesize'];
 	} elseif ( file_exists( $file ) ) {
-		$file_size = filesize( $file );
+		$file_size = wp_filesize( $file );
 	}
 	if ( ! empty( $file_size ) ) {
 		?>
 		<div class="misc-pub-section misc-pub-filesize">
 		<?php
 	}
 }
 /**
-* Parse ID3v2, ID3v1, and getID3 comments to extract usable data
+* Parses ID3v2, ID3v1, and getID3 comments to extract usable data.
 *
 * @since 3.6.0
 *
-* @param array $metadata An existing array with data
+* @param array $metadata An existing array with data.
-* @param array $data Data supplied by ID3 tags
+* @param array $data Data supplied by ID3 tags.
 */
 function wp_add_id3_tag_data( &$metadata, $data ) {
 	foreach ( array( 'id3v2', 'id3v1' ) as $version ) {
 		if ( ! empty( $data[ $version ]['comments'] ) ) {
 			foreach ( $data[ $version ]['comments'] as $key => $list ) {
 		}
 	}
 }
 /**
-* Retrieve metadata from a video file's ID3 tags
+* Retrieves metadata from a video file's ID3 tags.
 *
 * @since 3.6.0
 *
 * @param string $file Path to file.
 * @return array|false Returns array of metadata, if found.
 	if ( ! class_exists( 'getID3', false ) ) {
 		require ABSPATH . WPINC . '/ID3/getid3.php';
 	}
-	$id3  = new getID3();
+	$id3 = new getID3();
+	// Required to get the `created_timestamp` value.
+	$id3->options_audiovideo_quicktime_ReturnAtomData = true; // phpcs:ignore WordPress.NamingConventions.ValidVariableName
 	$data = $id3->analyze( $file );
 	if ( isset( $data['video']['lossless'] ) ) {
 		$metadata['lossless'] = $data['video']['lossless'];
 	}
 	 * @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.
+	 * @param array  $data           Raw metadata from getID3.
 	 */
 	return apply_filters( 'wp_read_video_metadata', $metadata, $file, $file_format, $data );
 }
 /**
-* Retrieve metadata from an audio file's ID3 tags.
+* Retrieves metadata from an audio file's ID3 tags.
 *
 * @since 3.6.0
 *
 * @param string $file Path to file.
 * @return array|false Returns array of metadata, if found.
 	if ( ! class_exists( 'getID3', false ) ) {
 		require ABSPATH . WPINC . '/ID3/getid3.php';
 	}
-	$id3  = new getID3();
+	$id3 = new getID3();
+	// Required to get the `created_timestamp` value.
+	$id3->options_audiovideo_quicktime_ReturnAtomData = true; // phpcs:ignore WordPress.NamingConventions.ValidVariableName
 	$data = $id3->analyze( $file );
 	if ( ! empty( $data['audio'] ) ) {
 		unset( $data['audio']['streams'] );
 		$metadata = $data['audio'];
 	return $metadata;
 }
 /**
-* Parse creation date from media metadata.
+* Parses 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
 			}
 			break;
 		case 'matroska':
 		case 'webm':
-			if ( isset( $metadata['matroska']['comments']['creation_time']['0'] ) ) {
+			if ( isset( $metadata['matroska']['comments']['creation_time'][0] ) ) {
-				$creation_date = strtotime( $metadata['matroska']['comments']['creation_time']['0'] );
+				$creation_date = strtotime( $metadata['matroska']['comments']['creation_time'][0] );
-			} elseif ( isset( $metadata['matroska']['info']['0']['DateUTC_unix'] ) ) {
+			} elseif ( isset( $metadata['matroska']['info'][0]['DateUTC_unix'] ) ) {
-				$creation_date = (int) $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'] ) ) {
+			if ( isset( $metadata['quicktime']['moov']['subatoms'][0]['creation_time_unix'] ) ) {
-				$creation_date = (int) $metadata['quicktime']['moov']['subatoms']['0']['creation_time_unix'];
+				$creation_date = (int) $metadata['quicktime']['moov']['subatoms'][0]['creation_time_unix'];
 			}
 			break;
 	}
 	return $creation_date;

changeset 19	3d72ae0968f4
parent 18	be944660c56a
child 21	48c4eec2b7e6