Commit Graph

16522 Commits

Author SHA1 Message Date
desrosj 6703f8efee Twenty Twenty-One: Use consistent casing in strings.
This converts strings using Title Case to sentence case, which is currently preferred for consistency (see discussions on #40244).

Also included is the replacement of an escaped apostrophe with `’`, which is also preferred per the Internationalization guidelines.

See #51526.
Built from https://develop.svn.wordpress.org/trunk@49578


git-svn-id: http://core.svn.wordpress.org/trunk@49316 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-11-12 19:30:11 +00:00
desrosj 5de5b186f3 Twenty Twenty-One: Ignore the `node_modules` folder in SVN.
[49576] mistakenly partially reverted [49250].

See #51526.
Built from https://develop.svn.wordpress.org/trunk@49577


git-svn-id: http://core.svn.wordpress.org/trunk@49315 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-11-12 19:07:10 +00:00
desrosj d23292b3c0 Twenty Twenty-One: Ignore `.css.map` files.
These are generated when Sass is compiled, but should never be committed.

See #51526.
Built from https://develop.svn.wordpress.org/trunk@49576


git-svn-id: http://core.svn.wordpress.org/trunk@49314 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-11-12 19:00:10 +00:00
desrosj ee888ad547 Twenty Twenty-One: Convert inline ESLint comments to JSHint.
WordPress Core currently uses JSHint instead of ESlint.

See #51526.
Built from https://develop.svn.wordpress.org/trunk@49575


git-svn-id: http://core.svn.wordpress.org/trunk@49313 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-11-12 18:48:08 +00:00
desrosj 967d29d83d Twenty Twenty-One: Merge the latest changes changes from GitHub for Beta 4.
In addition to syncing the latest changes, this change also merges the theme’s `.scss` files and other related build tool configurations required to compile the theme’s CSS.

This will allow development of the theme to continue on Trac after 5.6 is released and the GitHub repository is archived.

For a full list of changes since [], see e7d5991...aa284fd.

Props poena, luminuu kjellr, aristath, justinahinon.
See #51526.
Built from https://develop.svn.wordpress.org/trunk@49574


git-svn-id: http://core.svn.wordpress.org/trunk@49312 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-11-12 18:36:15 +00:00
TimothyBlynJacobs 5ee48d6915 App Passwords: MOAR accessibility improvements.
Corrects the "Application Name" field's aria-describedby attribute and makes the description visible.

Props alexstine, SergeyBiryukov.
Fixes #51580.

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


git-svn-id: http://core.svn.wordpress.org/trunk@49311 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-11-12 18:14:08 +00:00
Sergey Biryukov d772517fcc Database: Clean up the `post_category` column removed from DB schema for new installations in WordPress 2.8.
Its presence may conflict with `WP_Post::__get()`, which should generally fill the non-existent `post_category` property, but is not triggered if the column exists in the database.

Follow-up to [10895].

Props leogermani, davidbaumwald, hellofromTonya.
Fixes #51288.
Built from https://develop.svn.wordpress.org/trunk@49572


git-svn-id: http://core.svn.wordpress.org/trunk@49310 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-11-12 17:55:11 +00:00
Sergey Biryukov 250d0660b2 Build/Test Tools: Only enforce PHP extension requirements when running core tests.
This allows other users of the WordPress unit test suite framework to run their own unit tests without needing the GD extension, which should only be a requirement if running core tests.

Follow-up to [49535].

Props jamescollins.
Fixes #50640.
Built from https://develop.svn.wordpress.org/trunk@49571


git-svn-id: http://core.svn.wordpress.org/trunk@49309 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-11-12 17:25:13 +00:00
Sergey Biryukov 8e58e38ef9 Build/Tests Tools: Restore [49491], accidentally reverted in [49566].
See #39210.
Built from https://develop.svn.wordpress.org/trunk@49570


git-svn-id: http://core.svn.wordpress.org/trunk@49308 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-11-12 17:15:08 +00:00
Sergey Biryukov 6ac50d705c Build/Tests Tools: Restore [49535], accidentally reverted in [49566].
See #39210.
Built from https://develop.svn.wordpress.org/trunk@49569


git-svn-id: http://core.svn.wordpress.org/trunk@49307 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-11-12 17:08:11 +00:00
antpb 522a7a5d40 Media: Allow users to switch from media grid to list mode in media library.
Fixes issue where media modal would open when switching from grid to list mode.

Props mista-flo, mukesh27.

Fixes #51396.

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


git-svn-id: http://core.svn.wordpress.org/trunk@49306 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-11-12 15:46:07 +00:00
antpb 8efbef867c Media: Improve count in Media Library pagination.
Deleting all visible items on the last page of the media library previously left a blank page with no media items available. Using `wp_count_attachements` instead of `found_posts` solves the problem.

Props donsony, karmatosed, desrosj, mista-flo, justinahinon.

Fixes #39968.

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


git-svn-id: http://core.svn.wordpress.org/trunk@49305 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-11-12 15:40:09 +00:00
Dominik Schilling abc9d961d5 I18N: Revert [49236] for now to investigate alternative implementations.
See #39210, #51678, #26511.
Built from https://develop.svn.wordpress.org/trunk@49566


git-svn-id: http://core.svn.wordpress.org/trunk@49304 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-11-12 14:43:09 +00:00
Sergey Biryukov 4446e597a7 Feeds: Register transient feed cache handler using the recommended method for SimplePie 1.3 or later.
This fixes a "Non-static method cannot be called statically" fatal error when calling `fetch_feed()` on PHP 8.

Follow-up to [21644], [21652], [22366], [22599].

Props dd32, afragen, Senning, markoheijnen, ComputerGuru, useStrict, Ipstenu, nacin, l3rady, HoaSi, NathanAtmoz, fabifott, jfoulquier, thefarlilacfield, subscriptiongroup, rogerlos, Mte90, mopsyd, dossy, stulab, MadtownLems, roikles, justlevine, joostdevalk, OptimizingMatters, hellofromTonya, bph, ayeshrajans, SergeyBiryukov.
Fixes #29204.
Built from https://develop.svn.wordpress.org/trunk@49565


git-svn-id: http://core.svn.wordpress.org/trunk@49303 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-11-12 14:36:10 +00:00
Sergey Biryukov 9c6f41419c Coding Standards: Pass an empty string instead of `null` as the `$replacement` parameter to `_deprecated_file()`.
Follow-up to [48327].

See #50767.
Built from https://develop.svn.wordpress.org/trunk@49564


git-svn-id: http://core.svn.wordpress.org/trunk@49302 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-11-12 11:17:07 +00:00
Peter Wilson 5da8c0fceb Canonical: Prevent ID enumeration of private post slugs.
Add check to `redirect_canonical()` to ensure the destination post is not using a private post status.

Props dd32, Denis-de-Bernardy, donmhico, helen, nacin, peterwilsoncc, pishmishy, TimothyBlynJacobs, tzafrir, Viper007Bond, whyisjake.
Fixes #5272.


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


git-svn-id: http://core.svn.wordpress.org/trunk@49301 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-11-12 04:16:08 +00:00
Sergey Biryukov 3a1265e188 I18N: Add trailing punctuation to some translator comments.
Follow-up to [49549].

See #51580.
Built from https://develop.svn.wordpress.org/trunk@49562


git-svn-id: http://core.svn.wordpress.org/trunk@49300 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-11-11 10:41:07 +00:00
Sergey Biryukov 9db9343826 Docs: Clarify `sprintf()` usage for the `before_widget` argument of `register_sidebar()`.
Follow-up to [49203], [49560].

See #19709.
Built from https://develop.svn.wordpress.org/trunk@49561


git-svn-id: http://core.svn.wordpress.org/trunk@49299 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-11-11 10:39:09 +00:00
Helen Hou-Sandí 19b035f04b Widgets: Do not use wrapping container in the admin.
This is due to the new `before|after_sidebar` args, which are empty by default, but can introduce markup that causes admin JS to stop working.

Also adds documentation for the `sprintf()` on `before_sidebar`.

Props audrasjb, lpointet.
See #19709.

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


git-svn-id: http://core.svn.wordpress.org/trunk@49298 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-11-10 20:40:09 +00:00
Helen Hou-Sandí 135c75c396 Editor: Display short description from block directory in results.
Props dd32, ryelle.
Fixes #51212.

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


git-svn-id: http://core.svn.wordpress.org/trunk@49297 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-11-10 20:26:08 +00:00
Sergey Biryukov 1f984603a2 Help/About: Add Site Health Status dashboard widget to the Help → Content tab.
Reorder the items in the help tab to align with their default position on the Dashboard screen.

Follow-up to [47063], [47300].

Props nlpro.
Fixes #51745.
Built from https://develop.svn.wordpress.org/trunk@49558


git-svn-id: http://core.svn.wordpress.org/trunk@49296 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-11-10 19:05:10 +00:00
Sergey Biryukov e503ee45d6 TinyMCE: Update to 4.9.11.
Changelog:
https://www.tiny.cloud/docs-4x/changelog/#version4911july132020
https://github.com/tinymce/tinymce/blob/4.x/changelog.txt

A full list of changes in this update can be found on GitHub:
https://github.com/tinymce/tinymce/compare/4.9.10...4.9.11

See #51051.
Built from https://develop.svn.wordpress.org/trunk@49557


git-svn-id: http://core.svn.wordpress.org/trunk@49295 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-11-10 10:44:08 +00:00
Andrew Ozz 16458d8fd2 Tests QUnit: Remove restriction on running the TinyMCE Textpattern WP plugin tests in PhantomJS.
Props @desrosj.
Fixes #42009.
Built from https://develop.svn.wordpress.org/trunk@49556


git-svn-id: http://core.svn.wordpress.org/trunk@49294 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-11-10 09:18:10 +00:00
antpb 64beb3ee49 Media: Removes duplicate alignment fix for browser uploader.
See #41648

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


git-svn-id: http://core.svn.wordpress.org/trunk@49293 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-11-09 23:43:07 +00:00
desrosj 964c353504 Tests: Remove duplicate `fields` key in `WP_Query` test.
Introduced in [46188].

See #51344.
Built from https://develop.svn.wordpress.org/trunk@49554


git-svn-id: http://core.svn.wordpress.org/trunk@49292 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-11-09 23:41:06 +00:00
antpb 4f2e88a574 Media: Adjusts alignment of file name text in browser uploader.
Sets a defined size for text alongside the media browser uploader button fixing alignment on popular browsers.

Props krupajnanda, mikeschroder, aaroncampbell, lucagrandicelli, andraganescu, samful, sabernhardt, andystitt829, kburgoine.
Fixes #41648

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


git-svn-id: http://core.svn.wordpress.org/trunk@49291 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-11-09 23:34:09 +00:00
Helen Hou-Sandí c57ce00691 Feeds: Don't treat media URLs with fragments as unique for enclosures.
Props archduck, dshanske.
Fixes #47421.

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


git-svn-id: http://core.svn.wordpress.org/trunk@49290 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-11-09 20:28:07 +00:00
desrosj 8562263fd6 Build/Test Tools: Remove PHP >= 5.3 check.
WordPress no longer supports PHP < 5.6.20. This check is no longer necessary.

Fixes #51737.
Built from https://develop.svn.wordpress.org/trunk@49551


git-svn-id: http://core.svn.wordpress.org/trunk@49289 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-11-09 19:42:06 +00:00
antpb 9901c9a48d Media: Adjust box-sizing for audio players.
Fix cropped container around playhead time in audio player.

Props ravipatel, sabernhardt, audrasjb, SergeyBiryukov, 
Fixes #51685

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


git-svn-id: http://core.svn.wordpress.org/trunk@49288 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-11-09 19:34:08 +00:00
TimothyBlynJacobs 74969e7fbe App Passwords: Further accessibility improvements.
- Add a label to the readonly password input.
- Handle focus loss after revoking app passwords.
- Handle focus loss after dismissing notices.
- Mark app name as `aria-required`.
- Use `aria-label` for detailed revoke button text instead of `title`.
- Use `-1` for `tabindex` instead of `0`.

Props alexstine, afercia, sabernhardt, audrasjb, joedolson, TimothyBlynJacobs.
Fixes #51580.

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


git-svn-id: http://core.svn.wordpress.org/trunk@49287 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-11-09 18:05:08 +00:00
desrosj 4040866754 Build/Test Tools: Clean up the new contributor welcome message.
Props ocean90, jeffpaul.
See #50401.
Built from https://develop.svn.wordpress.org/trunk@49548


git-svn-id: http://core.svn.wordpress.org/trunk@49286 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-11-09 17:31:08 +00:00
Sergey Biryukov 8114076a50 Tests: Use `assertSame()` in some newly introduced tests.
This ensures that not only the return values match the expected results, but also that their type is the same.

Going forward, stricter type checking by using `assertSame()` should generally be preferred to `assertEquals()` where appropriate, to make the tests more reliable.

Follow-up to [48937], [48939], [48940], [48944].

See #38266.
Built from https://develop.svn.wordpress.org/trunk@49547


git-svn-id: http://core.svn.wordpress.org/trunk@49285 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-11-09 15:45:08 +00:00
Sergey Biryukov 5b62b44c15 Coding Standards: Use consistent formatting for error messages in `WP_Image_Editor_Imagick::write_image()` and `::strip_meta()`.
See #50767.
Built from https://develop.svn.wordpress.org/trunk@49546


git-svn-id: http://core.svn.wordpress.org/trunk@49284 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-11-09 15:35:05 +00:00
Sergey Biryukov 3e3328a269 General: Set `svn:eol-style` for some new files in `phpunit/includes`.
Follow-up to [48845], [49037], [49226], [49230].

See #51113.
Built from https://develop.svn.wordpress.org/trunk@49545


git-svn-id: http://core.svn.wordpress.org/trunk@49283 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-11-09 15:25:08 +00:00
John Blackbourn 34765ddb64 Docs: Docblock corrections relating to `WP_Post` objects.
See #51373, #50768

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


git-svn-id: http://core.svn.wordpress.org/trunk@49282 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-11-09 15:15:08 +00:00
Sergey Biryukov 847a2e22a0 Tests: Remove empty `export` directory.
Follow-up to [30518], [31253], [34328].

See #51344.
Built from https://develop.svn.wordpress.org/trunk@49543


git-svn-id: http://core.svn.wordpress.org/trunk@49281 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-11-09 15:11:08 +00:00
John Blackbourn 3688a9394e Media: Restore the ability of `WP_Image_Editor_Imagick->save()` to create a missing directory when needed.
Props eemitch, mikeschroder, hellofromTonya, p00ya, johnbillion

Fixes #51665

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


git-svn-id: http://core.svn.wordpress.org/trunk@49280 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-11-09 13:18:04 +00:00
Sergey Biryukov 2d8633bf22 I18N: Merge duplicate "Column" strings, remove unnecessary context.
Props ramiy, justinahinon, garrett-eclipse, audrasjb.
Fixes #47259.
Built from https://develop.svn.wordpress.org/trunk@49541


git-svn-id: http://core.svn.wordpress.org/trunk@49279 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-11-09 11:17:07 +00:00
Sergey Biryukov 2c5607307f Coding Standards: Adjust formatting in `WP_Block::render()` for better readability.
Follow-up to [49310], [49539].

See #51606.
Built from https://develop.svn.wordpress.org/trunk@49540


git-svn-id: http://core.svn.wordpress.org/trunk@49278 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-11-09 11:01:05 +00:00
Sergey Biryukov a2d42351c5 Text Changes: Unify various "Back to..." vs. "Return to..." vs. "Go to..." strings.
Standardize on "Go to..." as a more appropriate option for most cases.

Props garrett-eclipse, kharisblank, audrasjb, ramiy, valentinbora.
Fixes #47235.
Built from https://develop.svn.wordpress.org/trunk@49539


git-svn-id: http://core.svn.wordpress.org/trunk@49277 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-11-09 10:53:10 +00:00
Sergey Biryukov 4a18c93f42 Networks and Sites: Assign the array of site or network data returned from filters to the respective class property:
* The array of network data returned from the `networks_pre_query` filter is assigned to the `networks` property of the current `WP_Network_Query` instance.
* The array of site data returned from the `sites_pre_query` filter is assigned to the `sites` property of the current `WP_Site_Query` instance.

This avoids the performance overhead of calling `WP_Network_Query::get_networks()` or `WP_Site_Query::get_sites()` twice: first when creating the object instance, then to retrieve the filtered results.

This also makes the filters a bit more consistent with other similar filters, e.g. `posts_pre_query`, `terms_pre_query`, `comments_pre_query`, or `users_pre_query`.

Follow-up to [46086], [48990].

Props yakimun, spacedmonkey.
Fixes #51333.
Built from https://develop.svn.wordpress.org/trunk@49538


git-svn-id: http://core.svn.wordpress.org/trunk@49276 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-11-08 11:47:06 +00:00
Sergey Biryukov 5683c46277 Site Health: Validate the test result data format in JS before using it.
This will discard any invalid responses instead of causing fatal errors.

It also makes badges optional, on the same basis as actions are optional. They are expected, but there may be situations where they are not present.

Props Clorith, dogwithblog, kraftbj, whyisjake, SergeyBiryukov.
Fixes #50145.
Built from https://develop.svn.wordpress.org/trunk@49537


git-svn-id: http://core.svn.wordpress.org/trunk@49275 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-11-08 09:52:10 +00:00
Sergey Biryukov c66edd0439 REST API: Use `_n()` in some error messages for proper plural forms support.
Follow-up to [47923], [49053].

Props audrasjb, tobifjellner, TimothyBlynJacobs, SergeyBiryukov.
Fixes #51727.
Built from https://develop.svn.wordpress.org/trunk@49536


git-svn-id: http://core.svn.wordpress.org/trunk@49274 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-11-07 21:59:11 +00:00
Sergey Biryukov ec9b010cea Build/Test Tools: Check if all the required PHP extensions are loaded before running the test suite.
Add the GD extension as a hard requirement.

This improves the reliability of the test suite and ensures that if the test infrastructure changes in the future and a platform requirement such as GD accidentally gets removed, the tests fail with an appropriate error message.

Follow-up to [48592].

Props ayeshrajans, jrf, johnbillion.
Fixes #50640.
Built from https://develop.svn.wordpress.org/trunk@49535


git-svn-id: http://core.svn.wordpress.org/trunk@49273 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-11-07 13:20:07 +00:00
TimothyBlynJacobs 2559fb2a8d App Passwords: Bump database version to flush rewrite rules.
Application Passwords introduced a new Rewrite Rule to handle the Authorization header on certain systems. This bumps the database version so the change is applied to sites upon upgrading to 5.6.

Fixes #51723.

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


git-svn-id: http://core.svn.wordpress.org/trunk@49272 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-11-06 22:15:09 +00:00
Sergey Biryukov af95efdd34 Docs: Add a `@see` reference to `esc_url()` from `esc_url_raw()`.
Follow-up to [49512].

See #50585.
Built from https://develop.svn.wordpress.org/trunk@49513


git-svn-id: http://core.svn.wordpress.org/trunk@49268 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-11-06 14:16:07 +00:00
Sergey Biryukov 6dd28116a1 Docs: Improve return value description for `esc_url()`.
Add a reference to `esc_url()` from `esc_url_raw()` return value description.

Props stevenlinx, audrasjb, helen.
Fixes #50585.
Built from https://develop.svn.wordpress.org/trunk@49512


git-svn-id: http://core.svn.wordpress.org/trunk@49267 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-11-06 14:03:06 +00:00
Sergey Biryukov 3f7d705cfe Bundled Themes: Correct list block alignment in editor styles.
Additionally:
* Indent nested lists in list and category blocks.
* Match ordered and unordered indentation for the classic block's lists.

This applies to:
* Twenty Ten
* Twenty Eleven
* Twenty Thirteen
* Twenty Fourteen
* Twenty Fifteen
* Twenty Sixteen
* Twenty Seventeen

Props sabernhardt, amolv, kjellr, audrasjb, francina.
Fixes #51157.
Built from https://develop.svn.wordpress.org/trunk@49511


git-svn-id: http://core.svn.wordpress.org/trunk@49266 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-11-06 11:53:05 +00:00
Sergey Biryukov a3faece50b Twenty Twenty: Correctly indent nested unordered lists in RTL editor styles.
Props sabernhardt.
Fixes #51574.
Built from https://develop.svn.wordpress.org/trunk@49510


git-svn-id: http://core.svn.wordpress.org/trunk@49265 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-11-06 11:38:09 +00:00
Sergey Biryukov 42b6ece059 Docs: Fix typo in a comment in `Walker::display_element()`.
Props david.binda, sabernhardt.
Fixes #51713.
Built from https://develop.svn.wordpress.org/trunk@49509


git-svn-id: http://core.svn.wordpress.org/trunk@49264 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-11-05 18:46:10 +00:00