Commit Graph

43781 Commits

Author SHA1 Message Date
Sergey Biryukov
afb02cb315 Coding Standards: Use strict comparison in wp-admin/includes/class-wp-automatic-updater.php.
Includes minor code layout fixes for better readability.

See #52627.
Built from https://develop.svn.wordpress.org/trunk@50762


git-svn-id: http://core.svn.wordpress.org/trunk@50371 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2021-04-16 12:01:15 +00:00
gziolo
ad48a15387 Editor: Update WordPress packages to use with WordPress 5.8
In the response to the discussion during the Dev Chat, I'm doing a first pass to keep WordPress packages up to date in the WordPress 5.8 release cycle.

See https://github.com/WordPress/wordpress-develop/pull/1176 for more details.

Props youknowriad, aristath, andraganescu.
See #52991.


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


git-svn-id: http://core.svn.wordpress.org/trunk@50370 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2021-04-15 15:19:43 +00:00
gziolo
660443bbc7 Editor: Backport changes for WordPress packages added in 5.7.1
Props peterwilsoncc.
See #52912.


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


git-svn-id: http://core.svn.wordpress.org/trunk@50369 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2021-04-15 11:03:35 +00:00
Sergey Biryukov
ac9f1a4685 Coding Standards: Give a variable in WP_Automatic_Updater::after_core_update() a more meaningful name.
Follow-up to [25841], [25873], [25882].

See #52627.
Built from https://develop.svn.wordpress.org/trunk@50759


git-svn-id: http://core.svn.wordpress.org/trunk@50368 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2021-04-15 10:31:08 +00:00
desrosj
e445660ee3 REST API: Allow authors to read their own password protected posts.
Allow authenticated users to read the contents of password protected posts if they have the `edit_post` meta capability for the post.

Props xknown, zieladam, peterwilsoncc, swissspidy, timothyblynjacobs.
Built from https://develop.svn.wordpress.org/trunk@50717


git-svn-id: http://core.svn.wordpress.org/trunk@50326 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2021-04-14 23:24:04 +00:00
desrosj
ac930e0e5f External libraries: Include upstream GetID3 fix for PHP 8.
Props jrf, xknown.
Built from https://develop.svn.wordpress.org/trunk@50714


git-svn-id: http://core.svn.wordpress.org/trunk@50323 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2021-04-14 23:10:04 +00:00
davidbaumwald
b7280388d6 Privacy: Ensure "Export Personal Data" does not generate invalid JSON.
Previously, when exporting personal data, if the JSON encoding of the data failed, the invalid JSON was still written to `export.json`.  This change captures the JSON encoding failure and adds a notice to the UI.  

Props hellofromTonya, jrf, SergeyBiryukov.
Fixes #52892.
Built from https://develop.svn.wordpress.org/trunk@50713


git-svn-id: http://core.svn.wordpress.org/trunk@50322 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2021-04-14 21:28:08 +00:00
desrosj
294c370d72 Upgrade/Install: Correct the alignment of error messages for the language installer.
This makes the CSS selector used to right align certain form related elements more specific. This prevents any error messages from being right aligned.

Props sabernhardt, audrasjb.
Fixes #52989.
Built from https://develop.svn.wordpress.org/trunk@50712


git-svn-id: http://core.svn.wordpress.org/trunk@50321 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2021-04-14 14:11:05 +00:00
Sergey Biryukov
0cd72ec474 Site Health: Correct test result status for the HTTPS test.
The supported status values for Site Health tests are `good`, `recommended`, and `critical`.

Follow-up to [50660].

Props TimothyBlynJacobs.
Fixes #52783.
Built from https://develop.svn.wordpress.org/trunk@50710


git-svn-id: http://core.svn.wordpress.org/trunk@50319 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2021-04-14 13:02:08 +00:00
Peter Wilson
793da8732f Bundled Themes: Bump versions for WordPress 5.7.1.
Twenty Twenty-One: Bump version to 1.3
Twenty Seventeen: Bump version to 2.7

Props desrosj, mukesh27, peterwilsoncc.
Fixes #52859.

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


git-svn-id: http://core.svn.wordpress.org/trunk@50317 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2021-04-13 23:49:06 +00:00
Sergey Biryukov
a274a14bdd Coding Standards: Use strict comparison in wp-admin/includes/class-custom-image-header.php.
Includes minor code layout fixes for better readability.

See #52627.
Built from https://develop.svn.wordpress.org/trunk@50707


git-svn-id: http://core.svn.wordpress.org/trunk@50316 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2021-04-13 19:05:04 +00:00
Sergey Biryukov
35de0a48fb Coding Standards: Use strict comparison in wp-admin/includes/class-custom-background.php.
Includes minor code layout fixes for better readability.

See #52627.
Built from https://develop.svn.wordpress.org/trunk@50706


git-svn-id: http://core.svn.wordpress.org/trunk@50315 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2021-04-13 18:01:04 +00:00
davidbaumwald
d6a1170c70 I18N: Add context to strings when updating a plugin or theme with a ZIP package.
After [48390], plugins and themes can be updated with an uploaded ZIP file.  Strings were added for comparing the "current" and "uploaded" versions of a plugin or theme, but lacked context for each as to the object being referenced.  This change adds a `plugin` or `theme` context to each of these strings for disambiguation.

Props dimadin, SergeyBiryukov.
Fixes #53017.
Built from https://develop.svn.wordpress.org/trunk@50705


git-svn-id: http://core.svn.wordpress.org/trunk@50314 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2021-04-13 17:38:05 +00:00
Dominik Schilling
2e6178bf3d Build/Test Tools: Remove an extra space in the job name for PHPUnit tests.
See #52625.
Built from https://develop.svn.wordpress.org/trunk@50704


git-svn-id: http://core.svn.wordpress.org/trunk@50313 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2021-04-13 16:12:06 +00:00
gziolo
b31964a44b Blocks: Add is_default handling to server side block styles registry
Ensures that register_block_style lets developer pass `is_default` flag to mark one of the block style variations as the default one.

Props mukesh27, xavivars.
Fixes #53006.


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


git-svn-id: http://core.svn.wordpress.org/trunk@50312 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2021-04-13 08:04:13 +00:00
davidbaumwald
989ec57389 Feeds: Rename "Summary" to "Excerpt" in Reading Settings.
On the "Reading Settings" page, the post excerpt was referred to as a "Summary".  For consistency with the rest of Core, this change updates "summary" to "excerpt" both in the setting and the relevant help tab.

Props SergeyBiryukov, ravipatel, mukesh27.
Fixes #52987.
Built from https://develop.svn.wordpress.org/trunk@50702


git-svn-id: http://core.svn.wordpress.org/trunk@50311 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2021-04-12 22:34:04 +00:00
Sergey Biryukov
8e059f3657 Coding Standards: Rewrite a fragment in request_filesystem_credentials() for clarity and to avoid repetition.
Follow-up to [8540], [8865].

See #52627.
Built from https://develop.svn.wordpress.org/trunk@50701


git-svn-id: http://core.svn.wordpress.org/trunk@50310 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2021-04-12 18:34:05 +00:00
Sergey Biryukov
82042a0377 Coding Standards: Use strict comparison in wp-admin/includes/file.php.
Includes minor code layout fixes for better readability.

See #52627.
Built from https://develop.svn.wordpress.org/trunk@50700


git-svn-id: http://core.svn.wordpress.org/trunk@50309 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2021-04-12 18:19:09 +00:00
Sergey Biryukov
c569c157f0 Coding Standards: Simplify the check for parent terms in export_wp().
This is more consistent with similar checks elsewhere in core.

See #52627.
Built from https://develop.svn.wordpress.org/trunk@50699


git-svn-id: http://core.svn.wordpress.org/trunk@50308 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2021-04-11 13:44:13 +00:00
Dominik Schilling
f3034f1b1c Customize: Set playsinline attribute for custom header videos.
With the `playsinline` attribute the video can also autoplay on mobile browsers without asking the user to open it up fullscreen.
Also, change all video element properties to use boolean values.

Props klevyke, ocean90.
Fixes #50111.
Built from https://develop.svn.wordpress.org/trunk@50698


git-svn-id: http://core.svn.wordpress.org/trunk@50307 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2021-04-10 12:40:05 +00:00
Dominik Schilling
8780574d11 Build/Test Tools: Remove remaining Travis CI references.
* Remove `travis:` tasks in Gruntfile.js.
* Remove status badge in README.md that comes from Travis CI via shields.io.
* Remove Travis CI related skipping in the `WP_UnitTestCase_Base::skipOnAutomatedBranches()` test method and related Docker environment variables.

Props johnbillion, SergeyBiryukov, ocean90.
See #52161.
Fixes #52666.
Built from https://develop.svn.wordpress.org/trunk@50697


git-svn-id: http://core.svn.wordpress.org/trunk@50306 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2021-04-10 12:07:04 +00:00
Sergey Biryukov
2a7238f658 Coding Standards: Give a variable in wp-admin/themes.php a more meaningful name.
Follow-up to [20029].

See #52627.
Built from https://develop.svn.wordpress.org/trunk@50696


git-svn-id: http://core.svn.wordpress.org/trunk@50305 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2021-04-10 12:01:10 +00:00
Rachel Baker
3d04a220be REST API: Move the rest_jsonp_enabled filter before setting the Content-Type header.
Fixes an issue where if JSONP was disabled the `Content-Type` HTTP header was still set to `application/javascript`.  

Props dd32, TimothyBlynJacobs.
Fixes #52691.
Built from https://develop.svn.wordpress.org/trunk@50695


git-svn-id: http://core.svn.wordpress.org/trunk@50304 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2021-04-09 21:28:08 +00:00
Sergey Biryukov
68b73d3696 Themes: Remove unused code fragment from wp-admin/themes.php.
Follow-up to [25666], [26141].

Props mukesh27, rkradadiya.
Fixes #53005.
Built from https://develop.svn.wordpress.org/trunk@50694


git-svn-id: http://core.svn.wordpress.org/trunk@50303 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2021-04-09 11:49:05 +00:00
Sergey Biryukov
bdacea193a Editor: Use a consistent way to retrieve post ID on Edit Post screens.
Props mukesh27, ravipatel, davidbaumwald.
Fixes #52995.
Built from https://develop.svn.wordpress.org/trunk@50693


git-svn-id: http://core.svn.wordpress.org/trunk@50302 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2021-04-09 11:31:09 +00:00
Sergey Biryukov
57da3e7813 Coding Standards: Remove unnecessary unset() calls in WP_Importer methods.
Variables created within the scope of a function are discarded automatically when PHP leaves the scope of the function, i.e. on `return`, so doing a call to `unset()` straight before a `return` statement is redundant.

Props jrf, ravipatel, rachelbaker, mukesh27.
Fixes #52996.
Built from https://develop.svn.wordpress.org/trunk@50692


git-svn-id: http://core.svn.wordpress.org/trunk@50301 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2021-04-08 11:12:08 +00:00
Sergey Biryukov
7d65ff4f7a Coding Standards: Use strict comparison in wp-admin/includes/dashboard.php.
Includes minor code layout fixes for better readability.

See #52627.
Built from https://develop.svn.wordpress.org/trunk@50689


git-svn-id: http://core.svn.wordpress.org/trunk@50298 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2021-04-07 18:34:07 +00:00
ryelle
d2d09b9a7a Accessibility: Administration: Update various background colors for increased contrast.
This ensures that contrast between text color and background meets the WCAG 2.0 AA recommended value. The following locations were changed:

- Network List Tables: Use lighter background colors for site status indicator.
- Nav Menus: Use a lighter background color for invalid menu items.
- Pointers: Use a darker background for pointer header.
- Themes: Use darker background on filter button hover.
- Customizer: Use darker background for selected widget.

Follow-up to [50025], [50571].
Props kebbet, melchoyce, peterwilsoncc.
Fixes #52760.


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


git-svn-id: http://core.svn.wordpress.org/trunk@50296 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2021-04-07 16:38:09 +00:00
gziolo
e6eb25fda4 Editor: Ensure @wordpress/inteface package is listed as a dependency
Discovered when backporting changes for WordPress 5.7.1 release.

See #52991.



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


git-svn-id: http://core.svn.wordpress.org/trunk@50295 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2021-04-07 11:39:19 +00:00
gziolo
e60fe4f2f3 Build Tools: Update development dependencies from WP packages
This patch updates only development dependencies for WordPress packages to align better with the Gutenberg plugin.

See #52991.


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


git-svn-id: http://core.svn.wordpress.org/trunk@50294 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2021-04-07 11:15:58 +00:00
Peter Wilson
f992857b31 Build tools: Revert package-lock.json change in [50682].
See #52768.

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


git-svn-id: http://core.svn.wordpress.org/trunk@50292 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2021-04-07 01:34:05 +00:00
Peter Wilson
312da2b826 Media: Do not lazy load hidden images or embeds.
Improve the check for sourceless or dimensionless media when determining if the lazy loading attribute should be added to iframes and images. Never include the lazy loading attribute on embeds of WordPress posts as the iframe is initially hidden.

Including `loading="lazy"` on initially hidden iframes and images can prevent the media from loading in some browsers.

Props adamsilverstein, fabianpimminger, flixos90, johnbillion, jonkastonka, joyously, peterwilsoncc, SergeyBiryukov, SirStuey, swissspidy.
Fixes #52768.


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


git-svn-id: http://core.svn.wordpress.org/trunk@50291 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2021-04-07 01:01:05 +00:00
Sergey Biryukov
21bcc7c836 Login and Registration: Check if $_GET['login'] is set before using it in wp-login.php.
This avoids an "Undefined index" PHP notice displayed as part of password reset process if `$_GET['key']` is set, but `$_GET['login']` is not.

Props satrancali.
Fixes #52980.
Built from https://develop.svn.wordpress.org/trunk@50677


git-svn-id: http://core.svn.wordpress.org/trunk@50286 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2021-04-06 18:39:10 +00:00
desrosj
c1e7f92d6a Build/Test Tools: Prevent PHPUnit tests on push for forks/private mirrors.
The reorganization of the PHPUnit workflow in [50441] unintentionally caused the tests to be run for every `push` event, even for forks and private mirrors.

Previously, the second job required the first one to pass, and the conditional check on the first prevented both from running. Because the first job is no longer required for the second, both jobs must have the appropriate conditional check.

Fixes #52983.
Built from https://develop.svn.wordpress.org/trunk@50670


git-svn-id: http://core.svn.wordpress.org/trunk@50282 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2021-04-06 15:14:10 +00:00
desrosj
94dae2b608 Bundled Themes: Update the “Tested up to” value.
“Tested up to” is not displayed on the theme directory or within the WordPress dashboard, but should be updated to be accurate for anyone reading the theme’s source code.

Follow up to [50508].

Fixes #52859.
Built from https://develop.svn.wordpress.org/trunk@50669


git-svn-id: http://core.svn.wordpress.org/trunk@50281 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2021-04-06 14:43:08 +00:00
desrosj
2b73649b52 Build/Test Tools: Update some dependencies.
This updates `elliptic` to version `6.5.4` through `npm audit fix`.

`uglify-js` is also updated to version `3.13.3`, and `grunt-contrib-uglify` to version `5.0.1`.

See #52624.
Built from https://develop.svn.wordpress.org/trunk@50668


git-svn-id: http://core.svn.wordpress.org/trunk@50280 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2021-04-06 14:31:21 +00:00
desrosj
cfe859c1f3 Twenty Twenty-One: Rebuild IE specific editor stylesheet.
This was not updated to include the changes from [50493].

Fixes #52981. See #52702.
Built from https://develop.svn.wordpress.org/trunk@50667


git-svn-id: http://core.svn.wordpress.org/trunk@50279 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2021-04-06 14:12:05 +00:00
desrosj
caa5abc6c1 Build/Test Tools: Update dependencies in default themes.
This updates several dependencies in the Twenty Nineteen, Twenty Twenty, and Twenty Twenty-One default themes.

See #52624.
Built from https://develop.svn.wordpress.org/trunk@50666


git-svn-id: http://core.svn.wordpress.org/trunk@50278 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2021-04-06 14:07:07 +00:00
Sergey Biryukov
53c0882200 Coding Standards: Use strict comparison in wp-admin/includes/credits.php.
See #52627.
Built from https://develop.svn.wordpress.org/trunk@50665


git-svn-id: http://core.svn.wordpress.org/trunk@50277 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2021-04-06 13:47:02 +00:00
Sergey Biryukov
48cd688076 Coding Standards: Use strict comparison in wp-admin/includes/comment.php.
See #52627.
Built from https://develop.svn.wordpress.org/trunk@50664


git-svn-id: http://core.svn.wordpress.org/trunk@50276 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2021-04-06 13:45:09 +00:00
Peter Wilson
72a04aa045 Options, Meta APIs: Update default color scheme swatch to match CSS changes.
Update the default/fresh theme color swatch displayed on user profile pages to match CSS changes made during the 5.7 release cycle.

Props audrasjb, desrosj, ninetyninew, ryelle.
Fixes #52750.


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


git-svn-id: http://core.svn.wordpress.org/trunk@50275 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2021-04-06 05:44:07 +00:00
Peter Wilson
7442fe63a0 Site Health: Reduce false reports of HTTPS failures.
Reduce severity of failing HTTPS tests from critical to warning. Stop reporting failures if the site is being accessed over HTTPS but `wp_is_https_supported()` indicates a lack of support.

Props annalamprou, AnotherDave, ayeshrajans, bobbingwide, Clorith, dragongate, eatsleepcode, gab81, geoffrey1963, Ipstenu, k3nsai, mmuyskens, nicegamer7, peterwilsoncc, pwallner, SergeyBiryukov, TimothyBlynJacobs, Toru.
Fixes #52783.

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


git-svn-id: http://core.svn.wordpress.org/trunk@50271 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2021-04-06 03:24:08 +00:00
Sergey Biryukov
b8f35c130c Coding Standards: Give some variables in WP_Importer a more meaningful name.
See #52627.
Built from https://develop.svn.wordpress.org/trunk@50658


git-svn-id: http://core.svn.wordpress.org/trunk@50270 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2021-04-05 10:50:03 +00:00
Sergey Biryukov
a338f84f32 Coding Standards: Use strict comparison in wp-admin/includes/class-wp-filesystem-*.php.
See #52627.
Built from https://develop.svn.wordpress.org/trunk@50657


git-svn-id: http://core.svn.wordpress.org/trunk@50269 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2021-04-05 10:38:07 +00:00
Sergey Biryukov
10a084a067 Coding Standards: Move some translator comments to the correct place.
Follow-up to [46273], [50060], [50117].

See #52627.
Built from https://develop.svn.wordpress.org/trunk@50654


git-svn-id: http://core.svn.wordpress.org/trunk@50266 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2021-04-04 18:30:05 +00:00
Sergey Biryukov
b6e32b9d4f REST API: Correct enum validation for numeric values.
When validating `enum` values as `integer` or `number`, consider a number with a zero fractional part to be equivalent to an integer of the same value.

In `rest_are_values_equal()`, when comparing two values of type `int` or `float` (in any combination), first cast both of them to `float` and then compare.

This matches some test cases from the official JSON Schema test suite.

Follow-up to [50010].

Props yakimun, stefanjoebstl, TimothyBlynJacobs, rachelbaker.
Fixes #52932.
Built from https://develop.svn.wordpress.org/trunk@50653


git-svn-id: http://core.svn.wordpress.org/trunk@50265 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2021-04-04 18:07:04 +00:00
Sergey Biryukov
907bfe74cd Coding Standards: Use strict comparison in wp-admin/includes/class-core-upgrader.php.
See #52627.
Built from https://develop.svn.wordpress.org/trunk@50652


git-svn-id: http://core.svn.wordpress.org/trunk@50264 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2021-04-04 16:49:09 +00:00
Sergey Biryukov
b70c00d6ac Build/Test Tools: Rename some Grunt tasks to use hyphens instead of camelCase.
This makes the task names more consistent with other tasks.

Follow-up to [41043], [48096], [50650].

See #52625.
Built from https://develop.svn.wordpress.org/trunk@50651


git-svn-id: http://core.svn.wordpress.org/trunk@50263 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2021-04-03 12:46:10 +00:00
davidbaumwald
3912ca99fd External Libraries: Update Underscore to version 1.12.1.
Full set of changes at https://github.com/jashkenas/underscore/compare/1.8.3...1.12.1.  
The new version includes a `sourceMappingURL` that causes a build failure, so this change 
also introduces a task to remove this from the source during the build.

Props mukesh27, hareesh-pillai, desrosj, SergeyBiryukov, TimoTijhof.
Fixes #45785.
Built from https://develop.svn.wordpress.org/trunk@50650


git-svn-id: http://core.svn.wordpress.org/trunk@50262 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2021-04-02 19:42:21 +00:00
desrosj
75923de5ef Build/Test Tools: Prevent the workflow for testing old branches from running on forks.
This adds a conditional statement to ensure the workflow that tests old branches only runs on the official `wordpress-develop` mirror. This prevents it from running on forks and private mirrors.

See #52653.
Built from https://develop.svn.wordpress.org/trunk@50648


git-svn-id: http://core.svn.wordpress.org/trunk@50260 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2021-04-02 16:22:04 +00:00