Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2025-03-12 06:43:20 +01:00
Code Issues Projects Releases Wiki Activity

Responsive images: few more inline docs fixes.

Browse Source 
Props jaspermdegroot.
See #34430.
Built from https://develop.svn.wordpress.org/trunk@35465


git-svn-id: http://core.svn.wordpress.org/trunk@35429 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Ozz 2015-10-30 23:36:25 +00:00
parent 2021bc0da2
commit 8edcfabf9c
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
wp-includes/media.php
View File

@ -895,7 +895,7 @@ function _wp_upload_dir_baseurl() {
* @since 4.4.0
* @access private
*
* @param string $size_name Image size. Accepts any valid image size name (thumbnail, medium, etc.).
* @param string $size_name Image size. Accepts any valid image size name ('thumbnail', 'medium', etc.).
* @param array $image_meta The image meta data.
* @return array|bool Array of width and height values in pixels (in that order)
* or false if the size doesn't exist.
@ -921,7 +921,6 @@ function _wp_get_image_size_from_meta( $size_name, $image_meta ) {
*
* @since 4.4.0
*
* @param int $attachment_id Optional. Image attachment ID.
* @param array|string $size Image size. Accepts any valid image size, or an array of width and height
* values in pixels (in that order). Default 'medium'.
@ -973,7 +972,7 @@ function wp_calculate_image_srcset( $image_name, $size_array, $image_meta, $atta
return false;
}
// Add full size to the '$img_sizes' array.
// Add full size to the '$image_sizes' array.
$image_sizes['full'] = array(
'width' => $image_meta['width'],
'height' => $image_meta['height'],
@ -1099,9 +1098,9 @@ function wp_get_attachment_image_sizes( $size, $image_meta = null, $attachment_i
}
if ( is_array( $image_meta ) ) {
$width = _wp_get_image_size_from_meta( $size, $image_meta );
if ( $width ) {
$width = absint( $width[0] );
$size_array = _wp_get_image_size_from_meta( $size, $image_meta );
if ( $size_array ) {
$width = absint( $size_array[0] );
}
}
}

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.4-beta2-35464';
$wp_version = '4.4-beta2-35465';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.