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

Docs: Update an inline comment in wp_get_attachment_image_sizes(), which came in as part of the Responsive Images merge in [34855].

Browse Source 
Props joemcgill.
See #33641.

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


git-svn-id: http://core.svn.wordpress.org/trunk@34841 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Drew Jaynes 2015-10-06 17:47:24 +00:00
parent f233b37d07
commit 1e2caf6712
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-includes/media.php
View File

@ -992,7 +992,7 @@ function wp_get_attachment_image_srcset( $attachment_id, $size = 'medium' ) {
*/ */
function wp_get_attachment_image_sizes( $attachment_id, $size = 'medium', $args = null ) { function wp_get_attachment_image_sizes( $attachment_id, $size = 'medium', $args = null ) {
// Try to get the image width from $args before calling image_downsize(). // Try to get the image width from $args.
if ( is_array( $args ) && ! empty( $args['width'] ) ) { if ( is_array( $args ) && ! empty( $args['width'] ) ) {
$img_width = (int) $args['width']; $img_width = (int) $args['width'];
} elseif ( $img = image_get_intermediate_size( $attachment_id, $size ) ) { } elseif ( $img = image_get_intermediate_size( $attachment_id, $size ) ) {

2
wp-includes/version.php
View File

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