Commit Graph

41686 Commits

Author SHA1 Message Date
whyisjake
0c91c23277 Comments: Ensure the proper comment count and pages for unapproved comments.
Previiously, unapproved comments can alter the comment count, returning incorrect page numbers.

Fixes #8973.

Props GregMulhauser, dd32, ryan, mrmist, hakre, solarissmoke, billerickson, ericlewis, SergeyBiryukov, chriscct7, dossy, lukecavanagh, renggo888, jdorner, matjack1, pento, audrasjb, imath, davidbaumwald, whyisjake.  


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


git-svn-id: http://core.svn.wordpress.org/trunk@47902 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-06-23 05:24:10 +00:00
whyisjake
446d06c45d Formatting: Extend wp_kses_hair and wp_kses_hair_parse to allow digits and underscores.
Fixes a lot of issues around parsing XML/HTML attributes.

Fixes #49464.

See #34406, #48608.

Props codeforest, zodiac1978, johnpgreen, dlh, ayeshrajans, johnpgreen, rilwis, travisnorthcutt, miqrogroove, chriscct7, whyisjake.

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


git-svn-id: http://core.svn.wordpress.org/trunk@47901 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-06-23 05:07:11 +00:00
whyisjake
98fc60aabe I18N: Introduce domain specific i18n gettext hooks.
Adding context to allow for more specific targeting. New hooks:

* `gettext-{$domain}`
* `gettext_with_context-{$domain}`
* `ngettext-{$domain}`
* `ngettext_with_context-{$domain}`

Fixes #49518.

Props geminilabs, garrett-eclipse, davidbaumwald, johnbillion, whyisjake.



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


git-svn-id: http://core.svn.wordpress.org/trunk@47900 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-06-23 04:43:10 +00:00
noisysocks
e7f9aca8dd Editor: Revert [48119].
This commit caused the majority of blocks in the block editor to no longer
register as they reference the old category names.

See #50278.

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


git-svn-id: http://core.svn.wordpress.org/trunk@47899 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-06-23 00:15:11 +00:00
whyisjake
9edf42f215 Administration: Remove unnecessary !important CSS rules from common.css
Fixes #47569.

Props foack, SergeyBiryukov, davidbaumwald, sabernhardt, isabel_brison, audrasjb. 


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


git-svn-id: http://core.svn.wordpress.org/trunk@47898 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-06-23 00:01:07 +00:00
whyisjake
f51cb0a7c5 Media: Ensure that uploaded images get a success notification by users with upload_files capability.
There was an early `wp_die` that was preventing the success notification from being sent in the upload process. 

Fixes #44581.

Props pbiron, mikeschroder, joemcgill, rebasaurus, whyisjake.


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


git-svn-id: http://core.svn.wordpress.org/trunk@47897 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-06-22 23:53:09 +00:00
whyisjake
84f39df101 Privacy: Use relative paths for exported personal data.
Ensures back-compat while moving to paths off of the /exports directory.

Fixes: #44038.

Props: allendav, mrTall, desrosj, garrett-eclipse, cameronamcintyre, nmenescardi, xkon, whyisjake, davidbaumwald.

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


git-svn-id: http://core.svn.wordpress.org/trunk@47896 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-06-22 22:40:11 +00:00
Sergey Biryukov
f27cb65e1e Administration: Remove the xmlns attribute on the <html> tag.
The attribute is specific to XHTML and is not needed in HTML5.

Props audrasjb, diddledan, hommealone, joyously, mukesh27, valentinbora, peterwilsoncc, SergeyBiryukov.
Fixes #49126.
Built from https://develop.svn.wordpress.org/trunk@48126


git-svn-id: http://core.svn.wordpress.org/trunk@47895 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-06-22 21:26:16 +00:00
Sergey Biryukov
89e99f57a2 Site Health: Correct the check of whether the theme directory is writable when the current theme is symlinked into the theme directory.
This ensures that the check is done on a sub-directory within `WP_CONTENT_DIR`, rather than outside of `ABSPATH`.

Props pbiron, Clorith.
Fixes #48199.
Built from https://develop.svn.wordpress.org/trunk@48125


git-svn-id: http://core.svn.wordpress.org/trunk@47894 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-06-22 20:15:14 +00:00
desrosj
d0d8ce1adb Docs: Small inline documentation corrections following [48121].
Also, remove the `version` argument from the `wp.deprecated()` call in `password-strength-meter.js`. This argument is for specifying the version a feature will be removed, not when the feature was removed.

Props hareesh-pillai.
Fixes #50413.
Built from https://develop.svn.wordpress.org/trunk@48124


git-svn-id: http://core.svn.wordpress.org/trunk@47893 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-06-22 19:09:11 +00:00
desrosj
35545bee43 Administration: Improve the plugin and theme auto-update emails.
This makes several improvements to the emails sent to site admins when plugin and theme auto-updates are attempted.

- Emails are now specifically tailored to the three results (success, failed, or mixed).
- Subject lines and body copy for mixed and failed results now correctly convey the importance of double checking the site in question.
- The site’s URL is now included in all emails.
- When failures occur, links to the Plugins and/or Themes pages in the admin are now included so that site owners can easily take action.

Props audrasjb, desrosj, azaozz, garrett-eclipse, paaljoachim, johnbillion, marybaum, pbiron.
Follow up to [47835].
See #50052.
Fixes #50268.
Built from https://develop.svn.wordpress.org/trunk@48123


git-svn-id: http://core.svn.wordpress.org/trunk@47892 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-06-22 18:18:08 +00:00
desrosj
acc97eae32 General: Reference the correct database version for 5.5.0 upgrades.
Follow up to [48121].

See #50413.
Built from https://develop.svn.wordpress.org/trunk@48122


git-svn-id: http://core.svn.wordpress.org/trunk@47891 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-06-22 17:33:08 +00:00
desrosj
4b60af1a6a General: Remove “whitelist” and “blacklist” in favor of more clear and inclusive language.
“The WordPress open source community cares about diversity. We strive to maintain a welcoming environment where everyone can feel included.”

With this commit, all occurrences of “whitelist” and “blacklist” (with the single exception of the `$new_whitelist_options` global variable) are removed. A new ticket has been opened to explore renaming the `$new_whitelist_options` variable (#50434).

Changing to more specific names or rewording sentences containing these terms not only makes the code more inclusive, but also helps provide clarity. These terms are often ambiguous. What is being blocked or allowed is not always immediately clear. This can make it more difficult for non-native English speakers to read through the codebase.

Words matter. If one contributor feels more welcome because these terms are removed, this was worth the effort.

Props strangerstudios, jorbin, desrosj, joemcgill, timothyblynjacobs, ocean90, ayeshrajans, davidbaumwald, earnjam.
See #48900, #50434.
Fixes #50413.
Built from https://develop.svn.wordpress.org/trunk@48121


git-svn-id: http://core.svn.wordpress.org/trunk@47890 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-06-22 17:26:13 +00:00
Sergey Biryukov
7dbc898342 Plugins: Make the appearance of plugin action links on Add Plugins screen more consistent.
This ensures that the "More Details" link does not randomly wrap to a second line depending on the length of the button label above.

Props sabernhardt, kharisblank, Otto42, paresh07.
Fixes #48648.
Built from https://develop.svn.wordpress.org/trunk@48120


git-svn-id: http://core.svn.wordpress.org/trunk@47889 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-06-22 15:30:18 +00:00
ellatrix
2349d1f999 Editor: Update default block categories
See https://github.com/WordPress/gutenberg/pull/19279.

Props aduth, gziolo.
Fixes #50278.

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


git-svn-id: http://core.svn.wordpress.org/trunk@47888 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-06-22 14:07:10 +00:00
gziolo
85c5bca472 Editor: Remove default "layout" block attribute from WP_Block_Type::get_attributes
The merging behavior which assigns the `layout` attribute in `WP_Block_Type` gets removed.

Props aduth, TimothyBlynJacobs.
Fixes #50257.


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


git-svn-id: http://core.svn.wordpress.org/trunk@47887 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-06-22 12:22:08 +00:00
gziolo
29ffb31cb3 Blocks: Add context fields to WP_Block_Type
New block context related fields were added as part of https://github.com/WordPress/gutenberg/pull/22686. This changest backports them to WP_Block_Type class.

Props aduth, spacedmonkey, mcsf, epiqueras.
Fixes #47656.  


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


git-svn-id: http://core.svn.wordpress.org/trunk@47886 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-06-22 10:26:14 +00:00
Andrea Fercia
aa98d37cad Accessibility: Improve readability by removing unnecessary italic font style.
Continues the removal of italic text where unnecessary or where used on whole lines and big chunks of text.
Removes italic type from:
- all the `howto` text e.g. the "Tags" meta box, the "Featured image" meta box, the "Insert/edit link" modal dialog in the Classic Editor 
- the Taxonomies list pages
- the edit Taxonomies pages
- the Menus page
- the Settings pages

Props audrasjb.
See #47327.

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


git-svn-id: http://core.svn.wordpress.org/trunk@47885 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-06-21 18:03:10 +00:00
Andrea Fercia
ae447adaf4 I18N: Restore the "Error:" prefix for error messages.
Partially reverts [48059] as there's no full consensus on the removal of the text prefix. Further actions should be taken to improve consistency and accessibility of the admin notices. Keeps some improvements to the translatable strings from [48059].

Fixes #47656.

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


git-svn-id: http://core.svn.wordpress.org/trunk@47884 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-06-21 14:00:09 +00:00
Sergey Biryukov
e0d440f77f Posts, Post Types: Avoid a PHP warning when get_the_content() is called outside of the loop.
This ensures that `$pages` and other globals are only used after they have been set up in `setup_postdata()`.

Follow-up to [44941].

Props tessawatkinsllc, dontdream, spacedmonkey, squarecandy, davidbaumwald, SergeyBiryukov.
Fixes #47824. See #42814.
Built from https://develop.svn.wordpress.org/trunk@48114


git-svn-id: http://core.svn.wordpress.org/trunk@47883 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-06-21 10:36:07 +00:00
Sergey Biryukov
08d4e7dd69 Posts, Post Types: Simplify test_setup_postdata_loop().
The important part here is calling `the_content()` after setting up post data for another post without updating global `$post`.

The `foreach()` loop is not necessary.

Follow-up to [UT1289].

See #47824, #24330.
Built from https://develop.svn.wordpress.org/trunk@48113


git-svn-id: http://core.svn.wordpress.org/trunk@47882 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-06-21 10:30:15 +00:00
TimothyBlynJacobs
88f54b22ba REST API: Add "Link" to the list of exposed cors headers.
Currently, only the X-WP-Total and X-WP-TotalPages headers are exposed which means that clients have to manually construct the URL to implement pagination instead of using the "prev" and "next" Links.

Additionally, a filter "rest_exposed_cors_headers" is introduced to make it simpler for plugins to expose additional headers.

Props Toro_Unit, ayeshrajans.
Fixes #50369.

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


git-svn-id: http://core.svn.wordpress.org/trunk@47881 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-06-20 23:56:12 +00:00
Sergey Biryukov
19bca10d79 Coding Standards: Replace echo sprintf() with printf().
See #49542.
Built from https://develop.svn.wordpress.org/trunk@48111


git-svn-id: http://core.svn.wordpress.org/trunk@47880 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-06-20 13:18:11 +00:00
Sergey Biryukov
be16bb9fba Docs: Remove extra spaces from @param tags.
Per the documentation standards, `@param` tags should be aligned with each other, but not with the `@return` tag.

See #49572.
Built from https://develop.svn.wordpress.org/trunk@48110


git-svn-id: http://core.svn.wordpress.org/trunk@47879 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-06-20 12:58:10 +00:00
Sergey Biryukov
b16368c268 Docs: Remove @staticvar tags from core.
The tag was supported in phpDocumentor 1.x, but is no longer supported in 2.x and 3.x.

Usage of static variables is considered an internal implementation detail and has no information value for someone reading the docs.

Props alishanvr, jrf.
Fixes #50426.
Built from https://develop.svn.wordpress.org/trunk@48109


git-svn-id: http://core.svn.wordpress.org/trunk@47878 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-06-20 12:40:12 +00:00
Sergey Biryukov
65724cf380 Docs: Correct DocBlock placement for allow_subdirectory_install filter.
See #49572.
Built from https://develop.svn.wordpress.org/trunk@48108


git-svn-id: http://core.svn.wordpress.org/trunk@47877 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-06-20 12:24:08 +00:00
Sergey Biryukov
d586e4330d Docs: Miscellaneous DocBlock corrections for email filters in wp-includes/user.php.
See #49572.
Built from https://develop.svn.wordpress.org/trunk@48107


git-svn-id: http://core.svn.wordpress.org/trunk@47876 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-06-20 12:22:07 +00:00
Sergey Biryukov
3fb623cf76 Docs: Use a hyphen with the "non" prefix in a more consistent way.
See #49572.
Built from https://develop.svn.wordpress.org/trunk@48106


git-svn-id: http://core.svn.wordpress.org/trunk@47875 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-06-20 12:16:10 +00:00
Sergey Biryukov
26621b3b44 Docs: Miscellaneous DocBlock corrections for plugin and theme installation and updates.
See #49572.
Built from https://develop.svn.wordpress.org/trunk@48105


git-svn-id: http://core.svn.wordpress.org/trunk@47874 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-06-20 12:14:09 +00:00
Sergey Biryukov
e13c363b17 Docs: Capitalize "ID", when referring to a post ID, term ID, etc. in a more consistent way.
See #49572.
Built from https://develop.svn.wordpress.org/trunk@48104


git-svn-id: http://core.svn.wordpress.org/trunk@47873 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-06-20 12:02:12 +00:00
Sergey Biryukov
58bda42fc8 Docs: Synchronize and correct the documentation for wp_nav_menu() arguments in bundled themes.
See #49572.
Built from https://develop.svn.wordpress.org/trunk@48103


git-svn-id: http://core.svn.wordpress.org/trunk@47872 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-06-20 11:22:10 +00:00
Sergey Biryukov
a576a13246 Docs: Remove an empty line between @param and @return tags, per the documentation standards.
See #49572.
Built from https://develop.svn.wordpress.org/trunk@48102


git-svn-id: http://core.svn.wordpress.org/trunk@47871 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-06-20 11:18:09 +00:00
John Blackbourn
afe406b82e Docs: Fix some documentation errors in bundled themes.
See #49572.
Built from https://develop.svn.wordpress.org/trunk@48101


git-svn-id: http://core.svn.wordpress.org/trunk@47870 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-06-20 07:24:06 +00:00
John Blackbourn
1a77bb81d8 Docs: Remove unnecessary variables names from @return tags.
See #49572.
Built from https://develop.svn.wordpress.org/trunk@48100


git-svn-id: http://core.svn.wordpress.org/trunk@47869 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-06-19 22:55:12 +00:00
John Blackbourn
37234874a5 Docs: Misc improvements to inline docs.
See #49572.
Built from https://develop.svn.wordpress.org/trunk@48099


git-svn-id: http://core.svn.wordpress.org/trunk@47868 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-06-19 22:28:13 +00:00
John Blackbourn
fe823d698f Docs: Corrections and improvements to inline docs related to XML sitemaps.
See #50117, #49572
Built from https://develop.svn.wordpress.org/trunk@48098


git-svn-id: http://core.svn.wordpress.org/trunk@47867 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-06-19 22:26:10 +00:00
John Blackbourn
acb8983ac1 Docs: Corrections and improvements to inline docs related to plugin and theme auto-updates.
See #50052, #49572
Built from https://develop.svn.wordpress.org/trunk@48097


git-svn-id: http://core.svn.wordpress.org/trunk@47866 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-06-19 22:17:07 +00:00
Sergey Biryukov
99d49a0cc3 Build/Test Tools: Replace the banner text from wp-emoji-loader.min.js in formatting.php during build process.
This ensures that `/*! This file is auto-generated */` comment is not included on front end as part of the inline Emoji detection script.

Follow-up to [41271], [46589].

Props superpoincare, SergeyBiryukov.
Fixes #49861.
Built from https://develop.svn.wordpress.org/trunk@48096


git-svn-id: http://core.svn.wordpress.org/trunk@47865 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-06-19 22:08:08 +00:00
Sergey Biryukov
82a5d41d9b Help/About: Move "Learn more: Auto-updates documentation" link about "Support", for consistency with other screens.
Follow-up to [48062].

See #50215.
Built from https://develop.svn.wordpress.org/trunk@48095


git-svn-id: http://core.svn.wordpress.org/trunk@47864 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-06-19 21:14:08 +00:00
Dominik Schilling
044c656bad Bump Akismet external to 4.1.6.
git-svn-id: http://core.svn.wordpress.org/trunk@47862 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-06-19 18:51:03 +00:00
Sergey Biryukov
896436f1b9 Sitemaps: Rename the wp_sitemaps_is_enabled filter to wp_sitemaps_enabled.
This makes it more consistent with the other filters of the similar purpose.

Props arpitgshah.
Fixes #50428. See #50117.
Built from https://develop.svn.wordpress.org/trunk@48094


git-svn-id: http://core.svn.wordpress.org/trunk@47861 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-06-19 18:00:07 +00:00
Sergey Biryukov
a15912561e Docs: Document globals in WP_Sitemaps_* classes the same way they are documented in the rest of core.
See #49572, #50117.
Built from https://develop.svn.wordpress.org/trunk@48093


git-svn-id: http://core.svn.wordpress.org/trunk@47860 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-06-19 17:56:09 +00:00
Andrew Ozz
aca919f007 Plugins and Themes Auto-Updates:
- Fix displaying of errors on the Themes screen.
- Correct the classes used for the error messages, and use `notice-alt` as notices are mostly shown on a white background.

Props afercia, azaozz.
Fixes #50405.
Built from https://develop.svn.wordpress.org/trunk@48092


git-svn-id: http://core.svn.wordpress.org/trunk@47859 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-06-19 16:51:14 +00:00
desrosj
019bc2d244 Docs: Add missing return type for _remove_theme_support().
See #49572.
Built from https://develop.svn.wordpress.org/trunk@48091


git-svn-id: http://core.svn.wordpress.org/trunk@47858 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-06-19 14:46:10 +00:00
Sergey Biryukov
0050998801 Filesystem API: Expicitly set directory permissions in WP_Filesystem_SSH2::mkdir().
This ensures the permissions are correct after a directory is created with `ssh2_sftp_mkdir()`, which appears to be affected by system `umask` settings.

Props bbrdaric.
Fixes #49218.
Built from https://develop.svn.wordpress.org/trunk@48090


git-svn-id: http://core.svn.wordpress.org/trunk@47857 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-06-19 10:38:08 +00:00
Sergey Biryukov
527696af3b Coding Standards: Add some space around control structures in WP_Filesystem_* classes for consistency and better readability.
Additionally, synchronize `$tempfile` and `$temphandle` variable names in `WP_Filesystem_FTPext` and `WP_Filesystem_ftpsockets`.

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


git-svn-id: http://core.svn.wordpress.org/trunk@47856 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-06-19 10:36:12 +00:00
whyisjake
1e3d4921fb Privacy: Revert use relative paths for exported personal data.
Tests need to be updated to pass.

See: #44038.

Unprops: whyisjake.


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


git-svn-id: http://core.svn.wordpress.org/trunk@47855 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-06-18 23:02:10 +00:00
whyisjake
2d514c83d5 Privacy: Use relative paths for exported personal data.
Ensures back-compat while moving to paths off of the `/exports` directory.

Fixes: #44038.

Props: allendav, mrTall, desrosj, garrett-eclipse, cameronamcintyre, nmenescardi, xkon, whyisjake. 


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


git-svn-id: http://core.svn.wordpress.org/trunk@47854 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-06-18 21:40:14 +00:00
Adam Silverstein
810e9c3c2b Formatting: new filter safecss_filter_attr_allow_css on css parts.
Enables developers to determine whether a section of CSS should be allowed or discarded. By default, the value will be false if the part contains \ ( & } = or comments. Returning true allows the CSS part to be included in the output.

Replaces the `safe_style_disallowed_chars` filter introduced in r47891.

Props azaozz.
Fixes #37134.


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


git-svn-id: http://core.svn.wordpress.org/trunk@47853 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-06-18 21:01:11 +00:00
Sergey Biryukov
50ffc3843b Docs: Add missing $user_data parameter name to lostpassword_post and lostpassword_errors filter DocBlocks.
Follow-up to [48084].

See #49521, #49572.
Built from https://develop.svn.wordpress.org/trunk@48085


git-svn-id: http://core.svn.wordpress.org/trunk@47852 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-06-18 20:29:15 +00:00