Commit Graph

38085 Commits

Author SHA1 Message Date
Adam Silverstein
4650753c6b Media: Fix image cropping on touch screen devices.
* In initCrop, handle touch events in addition to mouse events.
* In imageSelect jQuery plugin, accept event.which of 0 as provided by touch events.

Props yahil, alexgso, joemcgill.
Merges [42818] to the 4.9 branch.
Fixes #41242.


Built from https://develop.svn.wordpress.org/branches/4.9@42874


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42704 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-03-24 20:26:42 +00:00
Gary Pendergast
61be857c95 Dashboard: Introduce a "Try Gutenberg" callout.
To encourage more people to try Gutenberg, this new Dashboard box allows site users to easily install and try out Gutenberg.

Props pento, melchoyce, joen, karmatosed, joemcgill, SergeyBiryukov, jorbin.

Fixes #41316.


Built from https://develop.svn.wordpress.org/branches/4.9@42869


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42699 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-03-22 00:59:44 +00:00
Sergey Biryukov
c12c3a96b3 Post WordPress 4.9.5 Beta 1 version bump.
Built from https://develop.svn.wordpress.org/branches/4.9@42868


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42698 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-03-21 02:16:37 +00:00
Sergey Biryukov
ce8c932138 WordPress 4.9.5 Beta 1
Built from https://develop.svn.wordpress.org/branches/4.9@42867


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42697 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-03-21 02:08:40 +00:00
Sergey Biryukov
9d75986391 Media: On Media Settings screen, make the pairs of labels and inputs always stacked vertically, on both mobile and desktop screens.
Make `<br />` tags on the screen behave as line breaks again after [41836]. Add a missing fieldset + legend for better accessibility.

Props afercia, RavanH, obenland, garrett-eclipse.
Merges [42864] to the 4.9 branch.
Fixes #42724. See #34539.
Built from https://develop.svn.wordpress.org/branches/4.9@42865


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42695 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-03-20 22:49:39 +00:00
Sergey Biryukov
8fae65141a Formatting: Avoid a PHP 7.2 warning in wp_kses_attr() when one of $allowedtags elements is an uncountable value.
Props andrei0x309, soulseekah, SergeyBiryukov.
Merges [42860] to the 4.9 branch.
Fixes #43312.
Built from https://develop.svn.wordpress.org/branches/4.9@42861


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42691 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-03-20 21:37:41 +00:00
Sergey Biryukov
6d16a905b8 Twenty Seventeen: Underline links in comments.
Props jainnidhi, larrach, audrasjb.
Merges [42713] to the 4.9 branch.
Fixes #43317.
Built from https://develop.svn.wordpress.org/branches/4.9@42859


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42689 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-03-20 21:19:41 +00:00
Dominik Schilling
04d41666dc REST API JavaScript Client: Support an empty string for nonce to disable sending the X-WP-Nonce header.
Passing a `nonce` argument with an empty string to `wp.api.init()` now does no longer fall back to `wpApiSettings.nonce`. This makes it possible to stop sending nonce headers, for example to a read-only endpoint on another site in a multisite install.

Merge of [42852] to the 4.9 branch.

Props adamsilverstein, FPCSJames, ocean90, swissspidy.
See #42948, #43266.
Built from https://develop.svn.wordpress.org/branches/4.9@42854


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42684 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-03-18 20:04:42 +00:00
Dominik Schilling
7faddf9e50 REST API JS Client: Extend custom nonce functionality to collections.
This brings the improved nonce handling from [41553] to collections to remove the direct `wpApiSettings.nonce` dependency.

Merge of [42851] to the 4.9 branch.

Props adamsilverstein, ocean90, swissspidy.
See #43265.
Built from https://develop.svn.wordpress.org/branches/4.9@42853


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42683 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-03-18 20:00:40 +00:00
Dominik Schilling
baba344254 Customizer menus: correct oversized viewport after dragging menu items.
Fix an issue where the screen viewport resized to an oversized state on mobile devices after moving sub-menus.

Merge of [42817] to the 4.9 branch.

Props adamsilverstein, kwonye.
Fixes #36884.
Built from https://develop.svn.wordpress.org/branches/4.9@42850


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42680 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-03-18 16:49:41 +00:00
Dominik Schilling
1410e91992 Comments: Remove unnecessary aria-required attribute from comment_form(), added with the function in [12810].
At the time, having both `required` and `aria-required` meant a wider range of support for browsers and assistive technology. Today, it's safe to use just `required`.

Merge of [42758] to the 4.9 branch.

Props lakenh, afercia, davidakennedy, henry.wright.
Fixes #39045.
Built from https://develop.svn.wordpress.org/branches/4.9@42849


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42679 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-03-18 16:45:40 +00:00
Dominik Schilling
276dbdc296 Media: Grid view - correct placeholder positioning during uploads.
Preventing contextually created attachments from being added to the grid collection in Attachments.validator. Remove the previous filtering introduced in [41937] which caused the placement issue.

Merge of [42739-42740] to the 4.9 branch.

Props lancewillett, Junaidkbr, designsimply, joemcgill.
Fixes #42968.
Built from https://develop.svn.wordpress.org/branches/4.9@42848


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42678 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-03-18 16:20:37 +00:00
Dominik Schilling
058176bc28 Readme: Update recommended PHP version to 7.2.
Merge of [42358] to the 4.9 branch.

Props otto42, johnbillion, rachelbaker, jorbin.
Fixes #42789.
Built from https://develop.svn.wordpress.org/branches/4.9@42847


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42677 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-03-18 16:13:39 +00:00
Dominik Schilling
a3528374a8 Customizer: In menus, reset results when closing the 'add items' panel.
Trigger a keyup event when clearing the search field in response to closing the add item panel. The keyup event triggers a search and resets the results. Previously, the search field was cleared while the potentially blank search results were left in place making it impossible to select new menu items.

Merge of [42744] to the 4.9 branch.

Props Blair jersyer, aranwer104, afercia.
See #43333.
Built from https://develop.svn.wordpress.org/branches/4.9@42846


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42676 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-03-18 15:10:42 +00:00
Dominik Schilling
5a4033d4c2 Multisite: Use a numbered placeholder in sprintf() for the site URL.
Fixes missing site domain in the link and a PHP warning.

Merge of [42844] to the 4.9 branch.

Props Thomas Vitale, conner_bw.
See #41645, #43568.
Built from https://develop.svn.wordpress.org/branches/4.9@42845


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42675 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-03-18 15:07:43 +00:00
Joe McGill
f2bf3d8d66 Update unit test following r42839.
This updates the expected version number for Hello Dolly in `Tests_Ajax_Update_Plugin::test_update_plugin` following [42839].

See #43555.

Merges [42841] to the 4.9 branch.

Built from https://develop.svn.wordpress.org/branches/4.9@42842


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42672 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-03-17 21:00:40 +00:00
Joe McGill
17251ec2c1 Update Hello Dolly lyrics.
This updates the Hello Dolly plugin to remove lines which could be objectionable when shown in the admin out of context, and brings the lyrics more in line with Louis Armstrong's recording.

Props sebastienthivinfocom, birgire, audrasjb, joemcgill.
Fixes #43555.

Merges [42839] to the 4.9 branch.

Built from https://develop.svn.wordpress.org/branches/4.9@42840


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42670 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-03-17 20:27:40 +00:00
Joe McGill
744e834816 Revert max-width styles on caption shortcodes.
This is a partial revert of [41724], so image captions include an
inline `width` style instead of `max-width`.

This returns the caption shortcode to the pre-4.9.0 behavior, while
retaining the extra unit test coverage added in [41724].

Fixes #43123. See #33981.

Merges [42837] to the 4.9 branch.

Built from https://develop.svn.wordpress.org/branches/4.9@42838


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42668 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-03-16 20:19:39 +00:00
John Blackbourn
9b7814a4a1 Security: Loosen the admin referrer policy header value to allow the referring host to be sent from the admin area in all cases.
This allows referrer-restricted content from third parties (such as images and fonts) to continue working in the admin area.

Props aranwer104, qcmiao

Fixes #43285

Merges [42830] to the 4.9 branch.

Built from https://develop.svn.wordpress.org/branches/4.9@42831


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42661 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-03-12 10:59:39 +00:00
Mike Schroder
7546fcc64a Media: Correctly allow changing PDF thumbnail crop value.
Corrects logic that kept plugins from setting crop value of intermediate image sizes for rendered PDFs.
Adds test.

Props leemon, SergeyBiryukov, chetan200891, birgire.
Merges [42792] to the 4.9 branch.
Fixes #43226.

Built from https://develop.svn.wordpress.org/branches/4.9@42813


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42643 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-03-09 03:21:40 +00:00
Sergey Biryukov
a91c3fbdc0 General: Replace Cheatin’ uh? with friendlier error messages.
While intended as a playful error message, `Cheatin’ uh?` can be interpreted as insulting or accusatory in an already stressful situation. This replaces Cheatin’ with more meaningful error messages, depending on the error that occurs.

Props ElectricFeet, EricMeyer, karmatosed, dd32, BandonRandon, melchoyce, kristastevens for language; dmsnell for original patch; peterwilsoncc.
Merged [42648] and [42719] to the 4.9 branch.
Fixes #38332.
Built from https://develop.svn.wordpress.org/branches/4.9@42811


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42641 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-03-09 00:15:42 +00:00
Sergey Biryukov
652bc5d967 XML-RPC: Add default values to IXR_Message for PHP 7.2 compatibility to avoid PHP Warnings.
Props dd32.
Merges [42652] to the 4.9 branch.
Fixes #43216.
Built from https://develop.svn.wordpress.org/branches/4.9@42806


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42636 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-03-08 19:56:40 +00:00
Sergey Biryukov
e0f0ee5de6 Users: Display partial names in the user listing tables.
This allows showing a name when only the first or last name is provided.

Props shital-patel, antipole.
Merges [42256] and [42257] to the 4.9 branch.
Fixes #42713.
Built from https://develop.svn.wordpress.org/branches/4.9@42805


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42635 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-03-08 19:48:39 +00:00
Sergey Biryukov
08aa0f52f9 Filesystem API: Avoid an infinite loop in wp_mkdir_p() when trying to determine the parent folder with open_basedir restriction in effect.
Props soulseekah, 1265578519-1.
Merges [42801] to the 4.9 branch.
Fixes #43417.
Built from https://develop.svn.wordpress.org/branches/4.9@42804


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42634 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-03-08 19:45:41 +00:00
Sergey Biryukov
7f190a310c Customize: Correct closing tags in customize_themes_print_templates().
Props johnpgreen, nandorsky.
Merges [42711] to the 4.9 branch.
Fixes #43307.
Built from https://develop.svn.wordpress.org/branches/4.9@42803


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42633 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-03-08 19:42:39 +00:00
Sergey Biryukov
d8da981665 Build/Test Tools: Update prefixed CSS properties in about.css.
Firefox 52+ supports unprefixed `column-count` and `column-gap` properties.

Props netweb, afercia.
Merges [42687] to the 4.9 branch.
Fixes #43190.
Built from https://develop.svn.wordpress.org/branches/4.9@42802


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42632 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-03-08 19:41:44 +00:00
Dion Hulse
3dd22cf28d Bump akismet external to 4.0.3.
See #43371


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42550 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-02-20 23:32:14 +00:00
Sergey Biryukov
8461e3a896 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
2018-02-07 23:49:41 +00:00
Sergey Biryukov
1f26b2945d Post 4.9.4 version bump for 4.9 branch
Built from https://develop.svn.wordpress.org/branches/4.9@42668


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42496 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-02-07 23:19:42 +00:00
Dion Hulse
dd84717899 Bump the 4.9 branch to version 4.9.4.
Built from https://develop.svn.wordpress.org/branches/4.9@42656


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42485 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-02-06 15:42:43 +00:00
Dion Hulse
662345c10f Updates: Partially revert [42584], as this branch of code should always be run after a core update check.
This code branch is responsible for running all autoupdates, including plugins and themes - which should run regardless of if there's a core autoupdate available.

This revert does not revert the `$timeout` changes, as these should still use cached data if it's available.
Ideally this should be decoupled from the core update check to allow background updates to operate even when the core update check is disabled or running more often than twice daily.

Merges [42653] to the 4.9 branch.
Fixes #43103, #43235.

Built from https://develop.svn.wordpress.org/branches/4.9@42654


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42483 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-02-06 12:47:42 +00:00
Sergey Biryukov
2643287b2c Bump the 4.9 branch to version 4.9.3.
Built from https://develop.svn.wordpress.org/branches/4.9@42650


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42479 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-02-05 20:05:41 +00:00
Sergey Biryukov
8edf395b50 Post WordPress 4.9.3 RC 1 version bump.
Built from https://develop.svn.wordpress.org/branches/4.9@42629


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42458 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-02-01 00:56:41 +00:00
Sergey Biryukov
f709f56129 WordPress 4.9.3 RC 1.
Built from https://develop.svn.wordpress.org/branches/4.9@42628


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42457 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-02-01 00:43:41 +00:00
Sergey Biryukov
b7df04afe4 Media: avoid page scrolling when opening the media modal.
Moves focus to a proper element within the media modal to avoid the underlying
page to scroll to the bottom. Removes the media modal `freeze` option.

Props andreiglingeanu, adamsilverstein.
Merges [42624] to the 4.9 branch.
Fixes #39859.
Built from https://develop.svn.wordpress.org/branches/4.9@42627


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42456 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-01-31 23:55:41 +00:00
Sergey Biryukov
9201cc33cc Code Editor: Add Ctrl/Cmd+F as aliases for persistent search for more intuitive behaviour.
Keep Alt+F as well for users who already expect that.

Props Desertsnowman.
Merges [42625] to the 4.9 branch.
See #42586.
Built from https://develop.svn.wordpress.org/branches/4.9@42626


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42455 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-01-31 22:28:43 +00:00
Sergey Biryukov
dc9c4c4738 Customize: Ensure heartbeat keeps changeset locked when in branching mode.
Props dlh.
See #42024.
Merges [42612] to the 4.9 branch.
Fixes #42658.
Built from https://develop.svn.wordpress.org/branches/4.9@42623


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42452 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-01-30 15:24:41 +00:00
Sergey Biryukov
8d9813f6f6 Customize: Ensure media playlists get initialized after selective refresh; expose new wp.playlist.initialize() API.
In particular allows audio and video playlists to be added to the Text widget and previewed.

Props bpayton, westonruter.
See #40854.
Merges [42613], [42617] to the 4.9 branch.
Fixes #42495.
Built from https://develop.svn.wordpress.org/branches/4.9@42622


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42451 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-01-30 14:56:41 +00:00
Sergey Biryukov
a07ed5c926 Customize: Include nav menu item for Home custom link in search results for "Home".
Props audrasjb, westonruter.
Merges [42611] to the 4.9 branch.
Fixes #42991.
Built from https://develop.svn.wordpress.org/branches/4.9@42621


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42450 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-01-30 14:46:40 +00:00
Sergey Biryukov
a271c43cdb Customize: Ensure customize_autosaved requests only use revision of logged-in user.
Props dlh, westonruter.
See #42433, #39896.
Merges [42615] to the 4.9 branch.
Fixes #42450.
Built from https://develop.svn.wordpress.org/branches/4.9@42620


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42449 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-01-30 14:44:42 +00:00
Sergey Biryukov
d7291a5435 Post WordPress 4.9.3 Beta 1 version bump.
Built from https://develop.svn.wordpress.org/branches/4.9@42609


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42438 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-01-24 23:47:40 +00:00
Sergey Biryukov
ab139de982 WordPress 4.9.3 Beta 1.
Built from https://develop.svn.wordpress.org/branches/4.9@42608


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42437 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-01-24 23:38:41 +00:00
Sergey Biryukov
3798ce6757 Role/Capability: Make install_languages capability check less restrictive.
A user should still be able to have the capability, even when language packs cannot be automatically installed. The automatic installation part is separate from that now.

Props flixos90.
Merges [42606] to the 4.9 branch.
Fixes #42697.
Built from https://develop.svn.wordpress.org/branches/4.9@42607


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42436 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-01-24 22:59:38 +00:00
Sergey Biryukov
2c492ab774 Upgrade/Install: In postMessage events handler, check for message object existence before checking its action property.
Props manikmist09.
Merges [42604] to the 4.9 branch.
Fixes #43005.
Built from https://develop.svn.wordpress.org/branches/4.9@42605


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42434 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-01-24 22:32:38 +00:00
Sergey Biryukov
ff4c656579 Emoji: Update Emoji browser support tests for Twemoji v2.4.0
Really, following [42598].

Props peterwilsoncc.
Merges [42602] to the 4.9 branch.
Fixes #42862.
Built from https://develop.svn.wordpress.org/branches/4.9@42603


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42432 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-01-24 22:05:39 +00:00
Sergey Biryukov
09a5894a92 Emoji: Update Emoji browser support tests for Twemoji v2.4.0
Replaces the fairy (male) browser support test with a woman in business suit levitating. While the things that make people different sometimes become less obvious this isn't always a problem, because the things that make you strange are the things that make you powerful.

Props peterwilsoncc.
Merges [42598] to the 4.9 branch.
Fixes #42862.
Built from https://develop.svn.wordpress.org/branches/4.9@42601


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42430 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-01-24 21:55:40 +00:00
Sergey Biryukov
519f479887 Media: Fix JSHint error after [42595].
Merges [42599] to the 4.9 branch.
See #42646.
Built from https://develop.svn.wordpress.org/branches/4.9@42600


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42429 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-01-24 21:53:38 +00:00
Aaron Jorbin
f0fd88a7f5 Query: Fix warning on counting non countable
Merges [42581], [42585], and [42594] to the 4.9 branch.

Adds tests to continue the behavior for both null and strings. Skip the tests on PHP 5.2 as they require ReflectionMethod.

See https://wiki.php.net/rfc/counting_non_countables for information on the PHP change.

Fixes #42860.
Props dd32 for test skipping and janak007 and ayeshrajans for initial patches.

Built from https://develop.svn.wordpress.org/branches/4.9@42597


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42426 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-01-24 21:44:42 +00:00
Sergey Biryukov
4224f6e214 Media: Store and reuse image cropper ratio settings if available, instead of overwriting.
Props adamsilverstein.
Merges [42595] to the 4.9 branch.
Fixes #42646.
Built from https://develop.svn.wordpress.org/branches/4.9@42596


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42425 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-01-24 21:41:41 +00:00
Sergey Biryukov
f29bf78748 Tests: Update emoji base URL in Tests_Formatting_Emoji after [42590].
Merges [42592] to the 4.9 branch.
See #42862.
Built from https://develop.svn.wordpress.org/branches/4.9@42593


git-svn-id: http://core.svn.wordpress.org/branches/4.9@42422 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-01-24 17:31:38 +00:00