Commit Graph

2418 Commits

Author SHA1 Message Date
Gary Pendergast
9292802d92 Twenty Seventeeen: Fix MediaElement control hover colours in the customiser.
When selecting custom colour schemes in the customiser, the hover colour is incorrectly applied to MediaElement controls.

Props xkon, ianbelanger.
Fixes #40843.


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


git-svn-id: http://core.svn.wordpress.org/trunk@44955 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-04-08 23:38:51 +00:00
Gary Pendergast
4487551344 Help: Update support forum links.
There are a lot of places in Core that link to https://wordpress.org/support/ for the support forums, but that's now the URL for HelpHub. The new forums link is https://wordpress.org/support/forums/.

Props jitendrabanjara1991, dilipbheda, mukesh27, ianbelanger.
Fixes #46790.


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


git-svn-id: http://core.svn.wordpress.org/trunk@44949 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-04-08 22:59:56 +00:00
Sergey Biryukov
965941ab3a Twenty Nineteen: Fix inconsistent tab/space indentation in style files.
Props iamdmitrymayorov, mukesh27.
Fixes #46821.
Built from https://develop.svn.wordpress.org/trunk@45132


git-svn-id: http://core.svn.wordpress.org/trunk@44941 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-04-07 06:18:51 +00:00
Sergey Biryukov
94b3dcc605 Bundled Themes: Link to an updated documentation on post thumbnails on developer.wordpress.org, instead of Codex.
Props samanehmirrajabi.
Fixes #46823.
Built from https://develop.svn.wordpress.org/trunk@45126


git-svn-id: http://core.svn.wordpress.org/trunk@44935 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-04-07 05:23:51 +00:00
Sergey Biryukov
3215ab96ce Twenty Twelve: Correct linear-gradient direction argument syntax.
In CSS, the `linear-gradient` function requires that the direction value explicitly use `to` instead of an implicit `from`.

Props: ianbelanger, joyously, man4toman.
Fixes #46786.
Built from https://develop.svn.wordpress.org/trunk@45124


git-svn-id: http://core.svn.wordpress.org/trunk@44933 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-04-06 16:17:50 +00:00
desrosj
fc2c675582 Twenty Eleven: Correct linear-gradient direction argument syntax.
In CSS, the `linear-gradient` function requires that the direction value explicitly use `to` instead of an implicit `from`.

Props: ianbelanger, Malae, man4toman.
Fixes #46770.
Built from https://develop.svn.wordpress.org/trunk@45109


git-svn-id: http://core.svn.wordpress.org/trunk@44918 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-04-04 18:26:52 +00:00
Sergey Biryukov
45cd565be3 Twenty Fifteen: Fix typo in a comment for print styles.
Props mukesh27.
Fixes #46767.
Built from https://develop.svn.wordpress.org/trunk@45096


git-svn-id: http://core.svn.wordpress.org/trunk@44905 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-04-02 13:07:51 +00:00
Sergey Biryukov
76e6cc67c2 Bundled Themes: Link to an updated documentation on child themes on developer.wordpress.org, instead of Codex.
Props man4toman, andraganescu.
Fixes #46450.
Built from https://develop.svn.wordpress.org/trunk@45081


git-svn-id: http://core.svn.wordpress.org/trunk@44890 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-04-01 11:56:52 +00:00
Sergey Biryukov
9ebc5e85fd Twenty Nineteen: Update Theme URI to point to the Theme Directory instead of the archived GitHub repository.
Update `style.scss` and `style-rtl.css`, missed in [45032].

Props dimadin.
See #46668.
Built from https://develop.svn.wordpress.org/trunk@45057


git-svn-id: http://core.svn.wordpress.org/trunk@44866 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-03-28 20:58:51 +00:00
Sergey Biryukov
07d5eda632 Twenty Seventeen: Make <th> styling in table block consistent between back end and front end.
Props ianbelanger.
Fixes #46568.
Built from https://develop.svn.wordpress.org/trunk@45051


git-svn-id: http://core.svn.wordpress.org/trunk@44860 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-03-28 15:25:50 +00:00
Adam Silverstein
418afaa938 Bundled Theme: trigger a new wp_body_open action immediately after the opening body tag.
* Enables inserting (asynchronous) JavaScript right after the opening `body` tag.
* Add a `wp_body_open` helper function that triggers the `wp_body_open` action.
* Call `wp_body_open` in core themes immediately after the opening `body` tag.

Props joostdevalk, valendesigns, nacin, saracup, jorbin, mikeschinkel, jonnybojangles, lgedeon, Willscrlt, Denis-de-Bernardy, lexiqueen, sky_76, welcher, westonruter, ramiy, joyously.
Fixes #12563.

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


git-svn-id: http://core.svn.wordpress.org/trunk@44851 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-03-27 21:59:52 +00:00
Sergey Biryukov
8633d837ee Twenty Nineteen: Update Theme URI to point to the Theme Directory instead of the archived GitHub repository.
Props dimadin.
Fixes #46668.
Built from https://develop.svn.wordpress.org/trunk@45032


git-svn-id: http://core.svn.wordpress.org/trunk@44841 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-03-27 14:32:51 +00:00
Andrea Fercia
faf11c8875 Accessibility: Improve the "Hello Dolly" accessibility.
- adds a visually hidden text to give context to the lyrics
- the text is `Quote from Hello Dolly song, by Jerry Herman:`
- adds a `lang` HTML attribute (when the admin language is not English) to better support assistive technologies 
- adds a `dir` HTML attribute to better support the LTR English lyrics with RTL languages 
- CSS adjustments

Props audrasjb, SergeyBiryukov, danieltj, birgire, karmatosed, desrosj, afercia.
Fixes #43632.

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


git-svn-id: http://core.svn.wordpress.org/trunk@44760 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-03-18 17:19:50 +00:00
allancole
df240768e3 Twenty Nineteen: Improve custom color behavior for InnerBlocks
Currently, if a parent block has a custom background color assigned, its child blocks will inherit the parent's text colors — even if the child block has its own custom text color assigned to it. 

This update changes the following: 

- Adjusts Twenty Nineteen's custom background color defaults to target direct children only which fixes the issue

Props kjellr.

See #46432.


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


git-svn-id: http://core.svn.wordpress.org/trunk@44650 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-03-07 22:37:50 +00:00
Aaron Jorbin
71cf332e65 Replace usages of basename() with wp_basename() in order to support multibyte filenames
This is focused on the pieces of code that touch media files and the tests that support them. `basename` isn't multibyte compatible out of the box. See http://php.net/basename and https://bugs.php.net/bug.php?id=62119.

See #43170.
Props Viper007Bond.

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


git-svn-id: http://core.svn.wordpress.org/trunk@44617 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-03-01 20:58:52 +00:00
Sergey Biryukov
60c217f531 Twenty Nineteen: Remove stray ÷ character in print.css.
Props mukesh27, laurelfulford.
Fixes #46083.
Built from https://develop.svn.wordpress.org/trunk@44774


git-svn-id: http://core.svn.wordpress.org/trunk@44606 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-02-28 02:47:51 +00:00
Sergey Biryukov
f7f806b5ef Twenty Nineteen: Update style-rtl.css after [44657].
See #45731.
Built from https://develop.svn.wordpress.org/trunk@44773


git-svn-id: http://core.svn.wordpress.org/trunk@44605 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-02-28 02:44:49 +00:00
Sergey Biryukov
f0a9df1aa2 Twenty Nineteen: Avoid nested comment author links in TwentyNineteen_Walker_Comment::html5_comment().
Props iamdmitrymayorov, mukesh27.
Fixes #46291.
Built from https://develop.svn.wordpress.org/trunk@44771


git-svn-id: http://core.svn.wordpress.org/trunk@44603 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-02-28 01:55:50 +00:00
laurelfulford
fd8a3db97b Twenty Nineteen: Update the quote block styles.
Update the theme's quote block border styles, so they will work better with the updated styles for the quote block, coming in Gutenberg 5.2.

Props @kjellr.
Fixes #46239.


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


git-svn-id: http://core.svn.wordpress.org/trunk@44571 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-02-13 18:40:49 +00:00
laurelfulford
a1eceec5bd Default Themes: Bump the version numbers and release dates.
Update the theme versions and release dates for the default themes, in time for WordPress 5.1.

The POT files for Twenty Eleven and Twenty Ten have also been updated.

Fixes #46070.


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


git-svn-id: http://core.svn.wordpress.org/trunk@44561 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-02-07 23:23:50 +00:00
laurelfulford
b9e6b7e2a3 Twenty Seventeen: Update blockquote alignment on load.
The theme uses JavaScript to check if a right-aligned blockquote is below the sidebar content before pushing it outside of the content area. This was originally only firing on browser resize.

Fixes #40103.


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


git-svn-id: http://core.svn.wordpress.org/trunk@44510 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-01-21 22:08:49 +00:00
laurelfulford
5c86facd5d Twenty Seventeen: Prevent YouTube videos from being cut off in Safari.
The theme's `object-fit: cover` styles for the header caused YouTube videos to be positioned too far left in Safari. 

Fixes #40522.


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


git-svn-id: http://core.svn.wordpress.org/trunk@44500 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-01-21 18:03:51 +00:00
laurelfulford
3993b8cda2 Twenty Nineteen: Create separate :lang() selectors for Devanagari.
In the non-latin font fallback styles, languages using the Devanagari alphabet were initially committed in a comma-separated list in the `:lang()` selector, which isn't fully supported. This update separates those languages into their own `:lang()` selectors. 

Props mako09.
Fixes #45731.


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


git-svn-id: http://core.svn.wordpress.org/trunk@44488 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-01-20 20:23:51 +00:00
laurelfulford
fc83cdfe6c Twenty Nineteen: Fix alignment of page title when there are no posts.
Fix the alignment of the "Nothing Found" page title when there are no posts, to match how it appears for the search results when nothing is found, and the 404 page. 

Props kjellr, lorenzone92.
Fixes #45887.


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


git-svn-id: http://core.svn.wordpress.org/trunk@44483 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-01-18 20:46:51 +00:00
laurelfulford
f8d655fe37 Twenty Nineteen: Use a less aggressive approach for non-latin font fallbacks.
The theme's original approach to its non-latin font fallbacks required `!important`, which overrode fonts that shouldn't have been changed, like the icon fonts used for editor buttons.

Props kjellr, mako09, allancole.
Fixes #45731.


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


git-svn-id: http://core.svn.wordpress.org/trunk@44481 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-01-18 18:38:50 +00:00
Gary Pendergast
7a617078fa Coding Standards: Upgrade WPCS to 1.2.1.
This upgrade fixes quite a few false positives, as well as auto-fixing some indenting issues.

Fixes #45956.


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


git-svn-id: http://core.svn.wordpress.org/trunk@44405 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-01-12 06:41:52 +00:00
Gary Pendergast
08e8270a48 Coding Standards: Extract extract() from the codebase.
Of the last four instances of `extract()` occurring, three of them are removed by this commit, and the fourth is appropriately documented.

See #45934.


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


git-svn-id: http://core.svn.wordpress.org/trunk@44400 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-01-12 03:20:48 +00:00
Gary Pendergast
4f861b9548 Coding Standards: Fix the Squiz.ControlStructures.ControlSignature.SpaceAfterCloseBrace violations.
See #45934.


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


git-svn-id: http://core.svn.wordpress.org/trunk@44397 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-01-11 06:40:50 +00:00
Gary Pendergast
c008959e9e Coding Standards: Fix the minor WordPress.WP.I18n violations.
`WordPress.WP.I18n.MissingTranslatorsComment` is in progress in #44360.

See #45934.


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


git-svn-id: http://core.svn.wordpress.org/trunk@44393 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-01-11 06:04:49 +00:00
Gary Pendergast
be127956e0 Bundled Themes: Run the pingback_url through esc_url().
Twenties Ten through Seventeen have been updated to properly escape the pingback URL. Twenty Nineteen is already escaping the URL.

Props soulseekah, sharaz.
Fixes #43717.


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


git-svn-id: http://core.svn.wordpress.org/trunk@44331 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-01-09 06:11:51 +00:00
Gary Pendergast
a583725622 Docs: Update Codex references to the Template_Hierarchy page.
https://codex.wordpress.org/Template_Hierarchy redirects to https://developer.wordpress.org/themes/basics/template-hierarchy/, so we should link to the correct page.

Props kmeze, pento.
Fixes #45222.


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


git-svn-id: http://core.svn.wordpress.org/trunk@44327 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-01-09 05:09:51 +00:00
desrosj
58d5410ceb Docs: Fix typos in Twenty Seventeen function descriptions.
Props faisal03, mukesh27.
Fixes #45466.
Built from https://develop.svn.wordpress.org/trunk@44479


git-svn-id: http://core.svn.wordpress.org/trunk@44310 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-01-08 19:22:49 +00:00
Gary Pendergast
7d77a6eb04 Docs: Correct the parameters passed to the twentyseventeen_custom_header_args filter.
The documented `$default_text_color` parameter isn't passed, and the `$video` parameter is passed, but not documented.

Props mukesh27.
Fixes #44920.

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


git-svn-id: http://core.svn.wordpress.org/trunk@44293 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-01-08 05:56:49 +00:00
Sergey Biryukov
8917b0e89f Default Themes: Bump the version numbers and release dates.
Update the theme versions and release dates for the default themes, in time for WordPress 5.0.3.

The POT file for Twenty Eleven has also been updated.

Props laurelfulford.
Fixes #45792.
Built from https://develop.svn.wordpress.org/trunk@44435


git-svn-id: http://core.svn.wordpress.org/trunk@44266 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-01-07 18:58:50 +00:00
Sergey Biryukov
1a622a8b81 Twenty Twelve: Correct padding rule precedence for Quote block.
Props superpoincare.
Fixes #45794.
Built from https://develop.svn.wordpress.org/trunk@44432


git-svn-id: http://core.svn.wordpress.org/trunk@44263 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-01-07 18:09:54 +00:00
desrosj
5781515e7d Twenty Seventeen: Update since and see annotations for twentyseventeen_unique_id().
Previously introduced in [43659].

See #44883.
Built from https://develop.svn.wordpress.org/trunk@44408


git-svn-id: http://core.svn.wordpress.org/trunk@44238 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-01-06 20:15:49 +00:00
laurelfulford
1c4a23faad Twenty Seventeen: Improve selectors for block editor custom colors.
Twenty Seventeen's original styles for the block editor custom colors had some issues: they weren't being applied to the button blocks due to lack of specificity, and when applied to paragraph blocks, there was no padding in the editor. This update makes sure the colors and related styles work as expected.

Fixes #45426.


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


git-svn-id: http://core.svn.wordpress.org/trunk@44232 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-01-05 21:16:49 +00:00
laurelfulford
dfeda2fb94 Bundled Themes: Bump script and style version numbers.
When existing scripts or styles are updated in default themes, the version numbers in the enqueues should also be bumped to make sure the old files don't cache. This update bumps version numbers for changes since version 5.0, for themes Twenty Eleven through Twenty Nineteen. 

Fixes #45679.


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


git-svn-id: http://core.svn.wordpress.org/trunk@44212 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-01-02 18:04:50 +00:00
laurelfulford
30c7257aad Bundled Themes: Make sure button blocks respect settings.
When the original block editor styles were added to the existing default themes, the button blocks were styled to match how each theme styled the `button` tag. 

However, the styles should respect the block editor's default style, "Rounded", and allow switching to the other styles, like "Outlined" and "Square".

Fixes #45541.


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


git-svn-id: http://core.svn.wordpress.org/trunk@44211 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-01-02 03:53:53 +00:00
laurelfulford
1d2efe8fa7 Twenty Fourteen: Correct video play button position.
A change to the MediaElement.js caused Twenty Fourteen's custom video play button to display in the top corner, rather than centered. This update returns it to its correct position. 

Props mmaumio, celloexpressions.
Fixes #44664.


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


git-svn-id: http://core.svn.wordpress.org/trunk@44210 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-01-02 01:47:51 +00:00
laurelfulford
7b44d484ea Twenty Fourteen: Remove text decoration from button block.
The button block in Twenty Fourteen was incorrectly inheriting a text underline from the theme's link styles.

Props bobbingwide.
Fixes #45732.


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


git-svn-id: http://core.svn.wordpress.org/trunk@44208 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-01-01 17:40:54 +00:00
laurelfulford
b7d28b5406 Twenty Nineteen: Update theme description and tags.
The original theme description in Twenty Nineteen was intended as a placeholder; this update replaces it with a proper description, and removes the unnecessary `theme-options` tag. 

Props jobthomas, kjellr.
Fixes #45693.


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


git-svn-id: http://core.svn.wordpress.org/trunk@44207 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-12-31 18:06:50 +00:00
laurelfulford
fcc423097c Twenty Nineteen: Improve menu semantics and keyboard navigation.
The menu's original markup included some non-semantic tags and an unnecessary `tabindex` attribute that made it difficult to navigate via keyboard. 

Props allancole, anevins, kjellr.
Fixes #45713.


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


git-svn-id: http://core.svn.wordpress.org/trunk@44206 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-12-31 17:49:50 +00:00
laurelfulford
7a3648a1e8 Twenty Nineteen: Push right-aligned image block outside of text column.
Update right-aligned image block styles to push them outside of the text column on the front end, to match the original design and how the block looks in the editor.

Props kjellr, joen, allancole.
Fixes #45716.


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


git-svn-id: http://core.svn.wordpress.org/trunk@44201 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-12-28 21:22:51 +00:00
laurelfulford
dd37acabea Twenty Nineteen: Fix hover appearance for outlined button block style.
The outlined button block style was displaying white text on a white background on hover. This update makes sure the text remains legible on hover when this button style is applied. 

Props rickalee, kjellr.
Fixes #45726.


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


git-svn-id: http://core.svn.wordpress.org/trunk@44200 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-12-28 20:15:49 +00:00
laurelfulford
3a155f3683 Twenty Nineteen: Remove underline from "Continue Reading" arrow.
The "Continue Reading" link that's generated by the More block is styled to include an arrow next to the text; that arrow shouldn't inherit the text underline style. This update removes it. 

Props littlebigthing, kjellr.
Fixes #45715.


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


git-svn-id: http://core.svn.wordpress.org/trunk@44199 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-12-28 19:20:51 +00:00
laurelfulford
bf308f6e92 Twenty Nineteen: Remove transparency from submenus.
On pages and posts with featured images, the top level menu items have a slight transparency on hover, which was being inherited by their submenus. This update removes that inheritance, improving readability and consistency in the menu's appearance. 

Props kjellr.
Fixes #45689.


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


git-svn-id: http://core.svn.wordpress.org/trunk@44198 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-12-28 18:12:51 +00:00
laurelfulford
8e54c18d0d Twenty Nineteen: Make sure links are followed on touchend, not touchstart.
The theme's original navigation JavaScript was making it so all links on a site were immediately followed on touchstart when using a touch-enabled device. This update makes sure links are followed at touchend, to improve usability and menu behavior.

Already committed to the 5.0 branch in [44357].

Props anevins, panchen, kjellr.
Fixes #45510.


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


git-svn-id: http://core.svn.wordpress.org/trunk@44188 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-12-21 21:36:49 +00:00
laurelfulford
fc094984ea Default Themes: Bump the version numbers and release dates.
Update the theme versions and release dates for the default themes, in time for WordPress 5.0.2.

The POT files for Twenty Ten and Twenty Eleven have also been updated.

Fixes #45681.


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


git-svn-id: http://core.svn.wordpress.org/trunk@44152 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-12-19 03:38:04 +00:00
desrosj
4aa38f2193 Bundled Themes: Replace “Gutenberg” in code comments and classes.
This update replaces the term “Gutenberg” in the themes code comments and classes with something more future-friendly.

Props laurelfulford.

Merges [44213] into trunk.

Fixes #45452.
Built from https://develop.svn.wordpress.org/trunk@44313


git-svn-id: http://core.svn.wordpress.org/trunk@44143 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-12-19 03:30:41 +00:00