From 8461e3a8961152c735abb386518f7bdc0966efb1 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Wed, 7 Feb 2018 23:49:41 +0000
Subject: [PATCH] Media: Avoid a PHP warning in `wp_calculate_image_srcset()`
 if a plugin returns a non-array value via `wp_calculate_image_srcset` filter.

Props mrmadhat, codegrau.
Merges [42639] to the 4.9 branch.
Fixes #43201.
Built from https://develop.svn.wordpress.org/branches/4.9@42669


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42497 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/media.php   | 2 +-
 wp-includes/version.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/wp-includes/media.php b/wp-includes/media.php
index dc49414629..9afb105268 100644
--- a/wp-includes/media.php
+++ b/wp-includes/media.php
@@ -1203,7 +1203,7 @@ function wp_calculate_image_srcset( $size_array, $image_src, $image_meta, $attac
 	$sources = apply_filters( 'wp_calculate_image_srcset', $sources, $size_array, $image_src, $image_meta, $attachment_id );
 
 	// Only return a 'srcset' value if there is more than one source.
-	if ( ! $src_matched || count( $sources ) < 2 ) {
+	if ( ! $src_matched || ! is_array( $sources ) || count( $sources ) < 2 ) {
 		return false;
 	}
 
diff --git a/wp-includes/version.php b/wp-includes/version.php
index ba89354af0..6fb87f2244 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.9.5-alpha-42668';
+$wp_version = '4.9.5-alpha-42669';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.