From 2049f04b4d8115fd839d22d95f3b2394bab12d9a Mon Sep 17 00:00:00 2001
From: Joe Dolson <joedolson@git.wordpress.org>
Date: Mon, 15 Nov 2021 20:53:08 +0000
Subject: [PATCH] Media: Featured image modal loads only selected image.

Fix bug introduced in [50829] that caused media modal to only load the selected image. Executes `.more()` when loading the modal to ensure that the media collection is available.

Props benitolopez, hellofromTonya, peterwilsoncc, danielbachhuber, PieWP, sabernhardt, szaqal21.
Fixes #53765.

git-svn-id: https://develop.svn.wordpress.org/trunk@52167 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/js/media/controllers/featured-image.js | 6 +++++-
 src/js/media/controllers/replace-image.js  | 5 +++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/js/media/controllers/featured-image.js b/src/js/media/controllers/featured-image.js
index e08129fa2d..83c39f9936 100644
--- a/src/js/media/controllers/featured-image.js
+++ b/src/js/media/controllers/featured-image.js
@@ -87,7 +87,6 @@ FeaturedImage = Library.extend(/** @lends wp.media.controller.FeaturedImage.prot
 	 * @since 3.5.0
 	 */
 	activate: function() {
-		this.updateSelection();
 		this.frame.on( 'open', this.updateSelection, this );
 
 		Library.prototype.activate.apply( this, arguments );
@@ -107,6 +106,7 @@ FeaturedImage = Library.extend(/** @lends wp.media.controller.FeaturedImage.prot
 	 */
 	updateSelection: function() {
 		var selection = this.get('selection'),
+			library = this.get('library'),
 			id = wp.media.view.settings.post.featuredImageId,
 			attachment;
 
@@ -116,6 +116,10 @@ FeaturedImage = Library.extend(/** @lends wp.media.controller.FeaturedImage.prot
 		}
 
 		selection.reset( attachment ? [ attachment ] : [] );
+
+		if ( library.hasMore() ) {
+			library.more();
+		}
 	}
 });
 
diff --git a/src/js/media/controllers/replace-image.js b/src/js/media/controllers/replace-image.js
index eb6823a22b..d042ec3c07 100644
--- a/src/js/media/controllers/replace-image.js
+++ b/src/js/media/controllers/replace-image.js
@@ -99,9 +99,14 @@ ReplaceImage = Library.extend(/** @lends wp.media.controller.ReplaceImage.protot
 	 */
 	updateSelection: function() {
 		var selection = this.get('selection'),
+			library = this.get('library'),
 			attachment = this.image.attachment;
 
 		selection.reset( attachment ? [ attachment ] : [] );
+
+		if ( library.hasMore() ) {
+			library.more();
+		}
 	}
 });