Commit Graph

30208 Commits

Author SHA1 Message Date
Peter Wilson
c56ec035ce Tests: Use shared post fixture in comment template tests.
See #51802.

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


git-svn-id: http://core.svn.wordpress.org/trunk@49567 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-12-21 03:17:01 +00:00
Peter Wilson
7a3d769b0f Query: Correct some coding standards after [49843].
See #44183

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


git-svn-id: http://core.svn.wordpress.org/trunk@49566 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-12-21 02:56:05 +00:00
John Blackbourn
8bc6a4ae6d Query: Correct some coding standards after [49843].
See #44183
Built from https://develop.svn.wordpress.org/trunk@49846


git-svn-id: http://core.svn.wordpress.org/trunk@49565 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-12-21 00:33:08 +00:00
John Blackbourn
e7cc15b321 Upload: Introduce the {$action}_overrides filter that allows the overrides parameter for file uploads and file sideloads to be filtered.
The dynamic portion of the hook name, `$action`, refers to the post action.

Props iandunn, jakub.tyrcha, nacin, wonderboymusic, Mte90, johnbillion

Fixes #16849

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


git-svn-id: http://core.svn.wordpress.org/trunk@49564 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-12-20 16:15:03 +00:00
John Blackbourn
f0d44a3402 Mail: Introduce a pre_wp_mail filter to allow short-circuiting the wp_mail() function without having to override the pluggable function.
Props DvanKooten, swissspidy, SergeyBiryukov, jtsternberg, ericlewis, Mte90, birgire, ayeshrajans

Fixes #35069

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


git-svn-id: http://core.svn.wordpress.org/trunk@49563 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-12-20 15:09:06 +00:00
John Blackbourn
5007f1ce13 Query: Ensure the author archive title always shows the name of the queried author, regardless of whether there are results.
This brings the behaviour inline with the `<title>` element of the page which always shows the author name.

Props Tkama, subrataemfluence

Fixes #44183

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


git-svn-id: http://core.svn.wordpress.org/trunk@49562 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-12-20 14:37:04 +00:00
Sergey Biryukov
0fe844c9c9 Docs: Use a canonical form of "knowledgeable" in readme.html.
Props shahinsid07, audrasjb.
Fixes #52125.
Built from https://develop.svn.wordpress.org/trunk@49842


git-svn-id: http://core.svn.wordpress.org/trunk@49561 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-12-20 12:58:02 +00:00
Sergey Biryukov
0e700c40ea Docs: Fix typo in getCursorMarkerSpan() DocBlock in js/_enqueues/wp/editor/base.js.
Props voboghure, mukesh27, audrasjb.
Fixes #52128.
Built from https://develop.svn.wordpress.org/trunk@49841


git-svn-id: http://core.svn.wordpress.org/trunk@49560 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-12-20 12:32:11 +00:00
Sergey Biryukov
e4dfced545 Twenty Ten: Correct $post_title variable name in loop-attachment.php.
Follow-up to [45609] / #47632.

Props sabernhardt.
Fixes #52121.
Built from https://develop.svn.wordpress.org/trunk@49840


git-svn-id: http://core.svn.wordpress.org/trunk@49559 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-12-19 20:45:05 +00:00
Sergey Biryukov
08e11dc1e6 Twenty Twenty-One: Clarify a sentence in readme.txt.
Props gkibria69.
Fixes #52120.
Built from https://develop.svn.wordpress.org/trunk@49838


git-svn-id: http://core.svn.wordpress.org/trunk@49557 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-12-19 20:36:06 +00:00
Sergey Biryukov
41c9686313 Docs: Update the reference to Appearance → Theme Editor admin menu item in the inline documentation.
Follow-up to [42685].

See #51800.
Built from https://develop.svn.wordpress.org/trunk@49837


git-svn-id: http://core.svn.wordpress.org/trunk@49556 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-12-18 15:46:04 +00:00
desrosj
24d77a5793 Build/Test Tools: Support the use of MariaDB in the local Docker environment.
In addition to MySQL, WordPress also supports MariaDB for databases. This makes changes to the local Docker environment to allow MariaDB to be used instead, if desired.

The `LOCAL_DB_TYPE` environment variable will now be used to determine which type of database container to use. This will default to `mysql`, but will also accept `mariadb`.

The `LOCAL_MYSQL` environment variable (which previously held the version of MySQL to use) has been replaced with the new, more generic `LOCAL_DB_VERSION` environment variable.

This change will make it possible to perform automated testing on a wider array of supported database types and versions.

Props davidbaumwald.
Fixes #51744. See #30462.
Built from https://develop.svn.wordpress.org/trunk@49836


git-svn-id: http://core.svn.wordpress.org/trunk@49555 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-12-18 15:29:03 +00:00
desrosj
fcb36e86bb Build/Test Tools: Run the Ajax test group for multisite.
This will help catch issues with Ajax related functionality on multisite.

A few tests have also been marked as `skipWithMultisite()` as they require network admin level capabilities when performing the same operations on a multisite install.

Props garrett-eclipse, netweb.
Fixes #46567.
Built from https://develop.svn.wordpress.org/trunk@49835


git-svn-id: http://core.svn.wordpress.org/trunk@49554 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-12-18 14:40:10 +00:00
desrosj
670500c739 Build/Test Tools: Generate a code coverage report using GitHub Actions.
This introduces a new GitHub Action workflow to generate a code coverage report when running the PHPUnit test suite as both a single and multisite install.

The workflow will run once per week on Sunday at 00:00 UTC.

For now, the reports are not submitted anywhere, but they will be uploaded to the workflow run as ZIP file artifacts where they will persist for 90 days.

Making code coverage reports more readily available will hopefully better highlight areas of Core with poor coverage, and encourage more contributors to help increase test coverage of those areas.

Props ocean90, johnbillion.
Fixes #52034.
Built from https://develop.svn.wordpress.org/trunk@49834


git-svn-id: http://core.svn.wordpress.org/trunk@49553 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-12-18 00:30:06 +00:00
Peter Wilson
343b375097 Coding Standards: Minor fixes following [49830].
Fixes the fixes missed in [49832]. They are fixed now.

See #13509, #48968, #48556.

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


git-svn-id: http://core.svn.wordpress.org/trunk@49552 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-12-18 00:28:03 +00:00
Peter Wilson
08acf6606a Coding Standards: Minor fixes following [49830].
See #13509, #48968, #48556.

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


git-svn-id: http://core.svn.wordpress.org/trunk@49551 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-12-18 00:19:05 +00:00
Sergey Biryukov
fa7e570e2a Twenty Nineteen: Add "Continue reading" link for post excerpts.
This ensures that archive pages have a meaningful link text after the excerpts.

Props metalandcoffee, alex27, sabernhardt, mdrockwell, laurelfulford.
Fixes #46177.
Built from https://develop.svn.wordpress.org/trunk@49831


git-svn-id: http://core.svn.wordpress.org/trunk@49550 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-12-17 18:21:05 +00:00
Boone Gorges
f124a2e529 Query: Respect post-type specific capabilities when querying for multiple post types.
After this change, the relevant `read_private_posts` capability is checked for
each queried post type. This ensures that private posts appear in search and
archive queries for users who have the ability to view those posts.

Props leogermani.

Fixes #13509, #48968, #48556.
Built from https://develop.svn.wordpress.org/trunk@49830


git-svn-id: http://core.svn.wordpress.org/trunk@49549 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-12-17 16:17:07 +00:00
desrosj
6daeadb85e Twenty Twenty-One: Correct @since inline documentation tags.
Previously, `1.0.0` was used for the version. This is inconsistent with the versioning used in the other default themes, which use use X.X and not X.X.X.

This change corrects all `1.0.0` occurrences to `1.0`, and adds the additional context of `Twenty Twenty-One` to avoid confusion with `WordPress 1.0`.

Props SergeyBiryukov, poena.
Fixes #51958.
Built from https://develop.svn.wordpress.org/trunk@49826


git-svn-id: http://core.svn.wordpress.org/trunk@49545 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-12-17 14:57:07 +00:00
desrosj
66d46430a7 Twenty Twenty-One: Make text within code blocks readable in Dark Mode.
This change ensures that the primary text color specific to Dark Mode is used instead of the one specified for normal mode. The latter is not legible in Dark Mode.

Props slaFFik, poena, mukesh27, justinahinon.
Fixes #51985.
Built from https://develop.svn.wordpress.org/trunk@49825


git-svn-id: http://core.svn.wordpress.org/trunk@49544 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-12-17 14:22:05 +00:00
desrosj
b7a899e8aa Twenty Twenty-One: Prevent <iframe> embeds from being too narrow.
This fixes an issue where `<iframe>` embeds were being pushed to the side of the screen and compressed to the point of being unusable.

Props helen, mukesh27, poena, thorlentz.
Fixes #52004.
Built from https://develop.svn.wordpress.org/trunk@49823


git-svn-id: http://core.svn.wordpress.org/trunk@49542 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-12-17 14:05:05 +00:00
desrosj
3dce40e526 Build/Test Tools: Save changes resulting from npm install.
See #51801.
Built from https://develop.svn.wordpress.org/trunk@49822


git-svn-id: http://core.svn.wordpress.org/trunk@49541 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-12-17 13:59:08 +00:00
Felix Arntz
bb234abee7 Media: Enable lazy-loading of iframes by adding the loading="lazy" attribute to iframe tags on the front-end.
* Expands the capabilities of `wp_filter_content_tags()` to add the attribute to iframe tags if enabled.
* Modifies the default behavior of `wp_lazy_loading_enabled()` so that it returns `true` for `iframe` tags.
* Introduces a `wp_iframe_tag_add_loading_attr()` function.
* Introduces a `wp_iframe_tag_add_loading_attr` filter.

Like for images, the attribute is only added to iframes which have both `width` and `height` specified (see related #50367).

Props azaozz, flixos90, westonruter.
Fixes #50756.

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


git-svn-id: http://core.svn.wordpress.org/trunk@49531 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-12-16 21:19:07 +00:00
Andrew Ozz
71ae342050 Editor: Fix improper triggering of the "Are you sure" prompt when navigating away from the old, "classic" Edit Post screen and there are no changes. Was triggered when there is an instance of TinyMCE in the Excerpt postbox.
Props rodrigosprimo, jonathanstegall, kevin940726, azaozz.
Fixes #52038.
Built from https://develop.svn.wordpress.org/trunk@49807


git-svn-id: http://core.svn.wordpress.org/trunk@49530 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-12-16 15:25:09 +00:00
iandunn
2ebc78cbf4 Feed: Replace join() with implode() for safety.
Canonical functions should be used instead of aliases, because aliases can be deprecated or removed withough much notice. See r49193.

Props SergeyBiryukov.
See #51056.

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


git-svn-id: http://core.svn.wordpress.org/trunk@49528 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-12-16 14:05:07 +00:00
Andrew Ozz
734f9bd9e2 Media: Fix the template for the "Align" and "Link To" fields in the media modal when inserting an image from URL.
Props noisysocks, mukesh27.
Fixes #52065.
Built from https://develop.svn.wordpress.org/trunk@49804


git-svn-id: http://core.svn.wordpress.org/trunk@49527 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-12-16 12:45:11 +00:00
iandunn
d544fc7cb4 Feed: Merge multiple header values to avoid fatal error.
When SimplePie parses HTTP headers, it combines multiple values for the same header into a comma-separated string. `WP_SimplePie_File` overrides the parsing, but was leaving them as an array instead.

That lead to a fatal error in PHP 8, because other parts of the codebase ended up passing an array to a function that expected a string.

Props david.binda, litemotiv, inc2734, NicolasKulka, hellofromTonya, mbabker, skithund, SergeyBiryukov, desrosj, timothyblynjacobs.
Fixes #51056. See #51956.


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


git-svn-id: http://core.svn.wordpress.org/trunk@49526 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-12-16 00:51:05 +00:00
John Blackbourn
ec900ebb43 Docs: Correct the documentation for the map_meta_cap() function and its filter.
See #51800

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


git-svn-id: http://core.svn.wordpress.org/trunk@49525 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-12-15 22:18:07 +00:00
Sergey Biryukov
b8f6d41a2c Twenty Twenty-One: Fix typos in some inline comments.
Props manzurahammed, mukesh27.
Fixes #52071.
Built from https://develop.svn.wordpress.org/trunk@49801


git-svn-id: http://core.svn.wordpress.org/trunk@49524 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-12-15 13:28:06 +00:00
ryelle
da72be5227 Twenty Twenty-One: Bring back PostCSS config.
Twenty Twenty-One uses PostCSS to convert the custom properties for Internet Explorer. Without a config file, the postcss command does nothing, causing issues in IE. This brings back the config from GitHub, which replaces all custom properties with the default values.

Props t-p, poena.
Fixes #52040.


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


git-svn-id: http://core.svn.wordpress.org/trunk@49523 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-12-14 16:49:03 +00:00
Sergey Biryukov
71bbd2b166 Twenty Twenty-One: Correct the DocBlock for map-deep-set() Sass function.
Props mukesh27.
Fixes #52064.
Built from https://develop.svn.wordpress.org/trunk@49799


git-svn-id: http://core.svn.wordpress.org/trunk@49522 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-12-14 15:22:09 +00:00
Sergey Biryukov
9494c5fbee Twenty Twenty-One: Use a more specific link for Dark Mode instructions.
Make both instances of the link translatable, for consistency.

Props engahmeds3ed, justinahinon.
Fixes #52010.
Built from https://develop.svn.wordpress.org/trunk@49798


git-svn-id: http://core.svn.wordpress.org/trunk@49521 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-12-13 18:40:06 +00:00
desrosj
3ed22735d3 Build/Test Tools: Allow code coverage reports to be generated when running tests as a multisite.
This adds the information needed to generate a code coverage report to the multisite ruleset.

Fixes #52034.
Built from https://develop.svn.wordpress.org/trunk@49797


git-svn-id: http://core.svn.wordpress.org/trunk@49520 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-12-12 20:09:08 +00:00
desrosj
4d4ec9484c Build/Test Tools: Remove PHPUnit 3.6.x specific settings from the multisite configuration.
In PHPUnit 3.6.x, `exclude` and `file` paths were required to be relative to the checkout root. This changed in PHPUnit 4 when the path requirements were changed require them to be relative to the configuration file.

Since PHPUnit 3.6.x is only used to test on PHP 5.2 in older branches and is no longer supported, these can be safely removed from the configuration file.

See #51802.
Built from https://develop.svn.wordpress.org/trunk@49796


git-svn-id: http://core.svn.wordpress.org/trunk@49519 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-12-12 18:08:02 +00:00
Sergey Biryukov
994167b76f Twenty Twenty-One: Fix typos in some inline comments.
Props tanvirul, mukesh27.
Fixes #52042.
Built from https://develop.svn.wordpress.org/trunk@49795


git-svn-id: http://core.svn.wordpress.org/trunk@49518 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-12-12 15:03:06 +00:00
Sergey Biryukov
4ca3db8c90 Twenty Twenty-One: Correct version in file-header.scss.
Fixes #52044.
Built from https://develop.svn.wordpress.org/trunk@49794


git-svn-id: http://core.svn.wordpress.org/trunk@49517 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-12-12 14:57:07 +00:00
ryelle
bba3a9d529 Twenty Nineteen: Add images for use in block patterns.
The block patterns were added in #51099, but the images were not included in the commit. This adds the images to the expected folder.

Props transl8or, mukesh27.
Fixes #51996.


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


git-svn-id: http://core.svn.wordpress.org/trunk@49516 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-12-11 16:55:03 +00:00
Sergey Biryukov
43bbbf1176 Docs: Document the usage of $wpdb global in WP_Query::get_posts() and ::set_found_posts().
Props jontyravi.
Fixes #52027.
Built from https://develop.svn.wordpress.org/trunk@49792


git-svn-id: http://core.svn.wordpress.org/trunk@49515 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-12-11 16:53:10 +00:00
desrosj
e4066a9af8 Build/Test Tools: Update several NPM packages.
These were updated using `npm audit fix`.

See #51801.
Built from https://develop.svn.wordpress.org/trunk@49791


git-svn-id: http://core.svn.wordpress.org/trunk@49514 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-12-11 14:05:07 +00:00
John Blackbourn
bf83c368fd Docs: Various docblock improvements.
See #51800

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


git-svn-id: http://core.svn.wordpress.org/trunk@49513 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-12-10 23:59:03 +00:00
John Blackbourn
42fcfa5b3d Docs: Various docblock corrections.
See #51800

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


git-svn-id: http://core.svn.wordpress.org/trunk@49512 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-12-10 23:53:07 +00:00
John Blackbourn
7e9060a0e4 Upgrade/Install: Remove a duplicate description for the upgrader_overwrote_package action.
See #51800, #9757

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


git-svn-id: http://core.svn.wordpress.org/trunk@49511 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-12-10 23:38:04 +00:00
John Blackbourn
1ead0719b7 Docs: Fix some docblock issues introduced in 5.6.
See #51800

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


git-svn-id: http://core.svn.wordpress.org/trunk@49510 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-12-10 23:27:06 +00:00
desrosj
2808e92c43 Build/Test Tools: Reestablish the codebase as a Git repo before reporting test results.
The test reporter uses the hidden `.svn` or `.git` directories to determine which changeset to send to WordPress.org along with the test report.

Because the GitHub Action workflow builds and prepares WordPress in a preceding job to share with each test job, the `.git` directory is missing (it is purposefully not included to limit artifact size).

This re-establishes the directory as a checkout of the `wordpress-develop` repository so that test results can be reported correctly.

See #50401.
Built from https://develop.svn.wordpress.org/trunk@49786


git-svn-id: http://core.svn.wordpress.org/trunk@49509 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-12-10 19:19:06 +00:00
Sergey Biryukov
4a69dfa63a Docs: Fix typo in some DocBlocks.
See #51800.
Built from https://develop.svn.wordpress.org/trunk@49785


git-svn-id: http://core.svn.wordpress.org/trunk@49508 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-12-10 18:12:03 +00:00
desrosj
c0806cf29c Build/Test Tools: Inline documentation updates for the PHPUnit workflow.
See #50401.
Built from https://develop.svn.wordpress.org/trunk@49784


git-svn-id: http://core.svn.wordpress.org/trunk@49507 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-12-10 15:30:04 +00:00
desrosj
66b75f9ad7 Build/Test Tools: Enable reporting of results to WordPress.org.
This configures reporting of the test results to the WordPress.org Host Test Results in the new GitHub Actions workflow for PHPUnit testing.

See https://make.wordpress.org/hosting/test-results/

Props mikeschroder, dd32.
See #50401.
Built from https://develop.svn.wordpress.org/trunk@49783


git-svn-id: http://core.svn.wordpress.org/trunk@49506 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-12-10 14:20:08 +00:00
desrosj
fb4450a86f Build/Test Tools: Use NodeJS 14 in GitHub Action workflows.
14.x is the current LTS release, and is what `trunk` currently runs.

See #50401.
Built from https://develop.svn.wordpress.org/trunk@49782


git-svn-id: http://core.svn.wordpress.org/trunk@49505 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-12-09 20:57:04 +00:00
desrosj
030b4bd1da Build/Test Tools: Disable GitHub Action workflow runs triggered on push for forks and mirrors.
In the current state, the workflows run regardless of the repository context. This results many needless workflow runs that waste resources.

Workflow runs for private repositories are not free (accounts have a finite allotment of minutes for private repositories). This becomes problematic in private repositories that also mirror the WordPress develop repository, as any workflow runs will draw from a user’s or organization’s allotted action minutes.

Without blanket disabling the workflow manually for all event triggers, or modifying the workflow files in the forked/mirrored repository, there is no way to tune when the workflows run.

This change introduces a conditional statement into all GitHub Action workflows that prevents them from running on forked/mirrored repositories that are not `wordpress-develop`, except when a pull request is being submitted to that repository.

The exception to this is the Welcome workflow that posts a helpful message to first time contributors to `wordpress-develop`. This message is specific to this repository, so should only run when a PR is submitted to that repository.

See #50401.
Built from https://develop.svn.wordpress.org/trunk@49781


git-svn-id: http://core.svn.wordpress.org/trunk@49504 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-12-09 20:06:04 +00:00
desrosj
e9feb6fca3 Build/Test Tools: Update package-lock.json file with several package updates.
These updates result from running `npm install`.

Also, update the version of `grunt-patch-wordpress` in the lock file from `3.0.0` to `3.0.1`.

See #51801.
Built from https://develop.svn.wordpress.org/trunk@49780


git-svn-id: http://core.svn.wordpress.org/trunk@49503 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-12-09 19:33:06 +00:00