From be03bcc7a9025feb140f7016e0aab08db2f10a89 Mon Sep 17 00:00:00 2001
From: Riad Benguella <benguella@gmail.com>
Date: Mon, 21 Oct 2019 11:15:34 +0100
Subject: [PATCH] Cherry-picking WordPress 5.3 RC2 bug fixes (#18046)

---
 packages/block-library/src/columns/editor.scss           | 9 ++++++++-
 .../media-utils/src/components/media-upload/index.js     | 3 ---
 packages/url/src/index.js                                | 4 ++++
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/packages/block-library/src/columns/editor.scss b/packages/block-library/src/columns/editor.scss
index dfa71f9f0589b..2045a1e12e965 100644
--- a/packages/block-library/src/columns/editor.scss
+++ b/packages/block-library/src/columns/editor.scss
@@ -43,7 +43,14 @@
 		> [data-type="core/column"] > .editor-block-list__block-edit .block-core-columns {
 			display: flex;
 			flex-direction: column;
-			flex: 1 0 auto;
+
+			// This flex rule fixes an issue in IE11.
+			flex: 1 1 auto;
+
+			// IE11 does not support `position: sticky`, so we use it here to serve correct Flex rules to modern browsers.
+			@supports (position: sticky) {
+				flex: 1;
+			}
 		}
 
 		// Adjust the individual column block.
diff --git a/packages/media-utils/src/components/media-upload/index.js b/packages/media-utils/src/components/media-upload/index.js
index 0ba3db65fd43b..eac379f9ebb68 100644
--- a/packages/media-utils/src/components/media-upload/index.js
+++ b/packages/media-utils/src/components/media-upload/index.js
@@ -125,9 +125,6 @@ class MediaUpload extends Component {
 		} else {
 			const frameConfig = {
 				title,
-				button: {
-					text: __( 'Select' ),
-				},
 				multiple,
 			};
 			if ( !! allowedTypes ) {
diff --git a/packages/url/src/index.js b/packages/url/src/index.js
index b4fa34efac51a..2b549d6ba1dc4 100644
--- a/packages/url/src/index.js
+++ b/packages/url/src/index.js
@@ -360,6 +360,10 @@ export function removeQueryArgs( url, ...args ) {
  * @return {string} The updated URL.
  */
 export function prependHTTP( url ) {
+	if ( ! url ) {
+		return url;
+	}
+
 	url = url.trim();
 	if ( ! USABLE_HREF_REGEXP.test( url ) && ! EMAIL_REGEXP.test( url ) ) {
 		return 'http://' + url;