WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Media: Correct some types for attachment ID parameters passed to functions and filters. 

See #47364, #50768 

Built from https://develop.svn.wordpress.org/trunk@49017


git-svn-id: http://core.svn.wordpress.org/trunk@48779 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
John Blackbourn 2020-09-20 14:05:05 +00:00
parent e22107ce4e
commit 43b11121de
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
wp-admin/includes/image.php
View File

@ -917,7 +917,7 @@ function file_is_displayable_image( $path ) {
*
* @since 2.9.0
*
* @param string $attachment_id Attachment ID.
* @param int $attachment_id Attachment ID.
* @param string $mime_type Image mime type.
* @param string $size Optional. Image size. Default 'full'.
* @return resource|GdImage|false The resulting image resource or GdImage instance on success,
@ -951,7 +951,7 @@ function load_image_to_edit( $attachment_id, $mime_type, $size = 'full' ) {
* @since 2.9.0
*
* @param resource|GdImage $image Current image.
* @param string $attachment_id Attachment ID.
* @param int $attachment_id Attachment ID.
* @param string $size Image size.
*/
$image = apply_filters( 'load_image_to_edit', $image, $attachment_id, $size );
@ -974,7 +974,7 @@ function load_image_to_edit( $attachment_id, $mime_type, $size = 'full' ) {
* @since 3.4.0
* @access private
*
* @param string $attachment_id Attachment ID.
* @param int $attachment_id Attachment ID.
* @param string $size Optional. Image size. Default 'full'.
* @return string|false File path or url on success, false on failure.
*/
@ -996,7 +996,7 @@ function _load_image_to_edit_path( $attachment_id, $size = 'full' ) {
* @since 3.1.0
*
* @param string $path Path to the current image.
* @param string $attachment_id Attachment ID.
* @param int $attachment_id Attachment ID.
* @param string $size Size of the image.
*/
$filepath = apply_filters( 'load_image_to_edit_filesystempath', $filepath, $attachment_id, $size );
@ -1011,7 +1011,7 @@ function _load_image_to_edit_path( $attachment_id, $size = 'full' ) {
* @since 3.1.0
*
* @param string $image_url Current image URL.
* @param string $attachment_id Attachment ID.
* @param int $attachment_id Attachment ID.
* @param string $size Size of the image.
*/
$filepath = apply_filters( 'load_image_to_edit_attachmenturl', wp_get_attachment_url( $attachment_id ), $attachment_id, $size );
@ -1023,7 +1023,7 @@ function _load_image_to_edit_path( $attachment_id, $size = 'full' ) {
* @since 2.9.0
*
* @param string|bool $filepath File path or URL to current image, or false.
* @param string $attachment_id Attachment ID.
* @param int $attachment_id Attachment ID.
* @param string $size Size of the image.
*/
return apply_filters( 'load_image_to_edit_path', $filepath, $attachment_id, $size );
@ -1035,7 +1035,7 @@ function _load_image_to_edit_path( $attachment_id, $size = 'full' ) {
* @since 3.4.0
* @access private
*
* @param string $attachment_id Attachment ID.
* @param int $attachment_id Attachment ID.
* @return string|false New file path on success, false on failure.
*/
function _copy_image_file( $attachment_id ) {

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
*
* @global string $wp_version
*/
$wp_version = '5.6-alpha-49016';
$wp_version = '5.6-alpha-49017';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.