Skip to content

Commit be03bcc

Browse files
authored
Cherry-picking WordPress 5.3 RC2 bug fixes (#18046)
1 parent 2a12dcc commit be03bcc

File tree

3 files changed

+12
-4
lines changed

3 files changed

+12
-4
lines changed

packages/block-library/src/columns/editor.scss

+8-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,14 @@
4343
> [data-type="core/column"] > .editor-block-list__block-edit .block-core-columns {
4444
display: flex;
4545
flex-direction: column;
46-
flex: 1 0 auto;
46+
47+
// This flex rule fixes an issue in IE11.
48+
flex: 1 1 auto;
49+
50+
// IE11 does not support `position: sticky`, so we use it here to serve correct Flex rules to modern browsers.
51+
@supports (position: sticky) {
52+
flex: 1;
53+
}
4754
}
4855

4956
// Adjust the individual column block.

packages/media-utils/src/components/media-upload/index.js

-3
Original file line numberDiff line numberDiff line change
@@ -125,9 +125,6 @@ class MediaUpload extends Component {
125125
} else {
126126
const frameConfig = {
127127
title,
128-
button: {
129-
text: __( 'Select' ),
130-
},
131128
multiple,
132129
};
133130
if ( !! allowedTypes ) {

packages/url/src/index.js

+4
Original file line numberDiff line numberDiff line change
@@ -360,6 +360,10 @@ export function removeQueryArgs( url, ...args ) {
360360
* @return {string} The updated URL.
361361
*/
362362
export function prependHTTP( url ) {
363+
if ( ! url ) {
364+
return url;
365+
}
366+
363367
url = url.trim();
364368
if ( ! USABLE_HREF_REGEXP.test( url ) && ! EMAIL_REGEXP.test( url ) ) {
365369
return 'http://' + url;

0 commit comments

Comments
 (0)