WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
42,188 Commits 50 Branches 749 Tags 982 MiB
Commit Graph

42188 Commits

Author SHA1 Message Date
Andrew Ozz 618c32686e Media: Fix `wp_image_file_matches_image_meta()` to also match when the original image URL is used. 
Also refreshes and fixes some of the unit tests for media, and replaces test-image-large.png with test-image-large.jpg which is larger to allow testing of `original_image` in the image meta.

Fixes #50628.


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


git-svn-id: http://core.svn.wordpress.org/trunk@48223 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-07-12 21:20:03 +00:00
Andrew Ozz 63a2cb3060 Upgrade/Install: Use `wp_strip_all_tags()` for the fields in the compare table on the "Update theme/plugin from uploaded zip" screen. Some may contain HTML. 
See #9757.
Built from https://develop.svn.wordpress.org/trunk@48453


git-svn-id: http://core.svn.wordpress.org/trunk@48222 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-07-12 20:00:03 +00:00
TimothyBlynJacobs df2b9b1689 REST API: Add Content-Disposition, Content-MD5 and X-WP-Nonce as allowed cors headers. 
The Content-Disposition and Content-MD5 headers allow for easier file uploading across domains by using a File/Blob object directly. The X-WP-Nonce header is allowed for making cross-origin and same-origin authenticated requests consistent.

Additionally a filter is introduced, "rest_allowed_cors_headers", to simplify the process of allowing additional request headers.

Props rmccue, TimothyBlynJacobs.
Fixes #41696.

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


git-svn-id: http://core.svn.wordpress.org/trunk@48221 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-07-12 19:37:12 +00:00
Sergey Biryukov 9848b6b3e9 Plugins: Make delete plugin message less scary. 
This adds a check if the plugin actually has an uninstall routine before saying that its data will be deleted too.

Props samful, joostdevalk, joyously, Chouby, SergeyBiryukov.
Fixes #50346.
Built from https://develop.svn.wordpress.org/trunk@48451


git-svn-id: http://core.svn.wordpress.org/trunk@48220 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-07-12 13:22:04 +00:00
Sergey Biryukov c4543704e2 Administration: Restore the `excerpt` key for the Extended view mode for backward compatibility for now. 
Props Offereins.
See #49715.
Built from https://develop.svn.wordpress.org/trunk@48450


git-svn-id: http://core.svn.wordpress.org/trunk@48219 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-07-12 11:36:04 +00:00
Sergey Biryukov 1556ecc000 Docs: Add a `@since` entry for the `$hook_extra` parameter added to `WP_Upgrader::download_package()`. 
Follow-up to [48399].

See #49686.
Built from https://develop.svn.wordpress.org/trunk@48449


git-svn-id: http://core.svn.wordpress.org/trunk@48218 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-07-12 11:02:03 +00:00
Sergey Biryukov 707534c2d8 Upgrade/Install: Use `is_php_version_compatible()` and `is_wp_version_compatible()` in plugin and theme requirement checks. 
Follow-up to [48390].

Props afragen.
See #9757.
Built from https://develop.svn.wordpress.org/trunk@48448


git-svn-id: http://core.svn.wordpress.org/trunk@48217 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-07-12 10:55:03 +00:00
Sergey Biryukov f83b8775b3 I18N: Move the "WordPress Backups" support URL to its own translatable string. 
Follow-up to [48390].

See #9757.
Built from https://develop.svn.wordpress.org/trunk@48447


git-svn-id: http://core.svn.wordpress.org/trunk@48216 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-07-12 10:34:05 +00:00
Sergey Biryukov 3f1650122a Docs: Miscellaneous DocBlock corrections for plugin and theme updates. 
See #49572.
Built from https://develop.svn.wordpress.org/trunk@48446


git-svn-id: http://core.svn.wordpress.org/trunk@48215 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-07-12 01:19:03 +00:00
Sergey Biryukov cecf7b9823 Administration: Handle the result of `Plugin_Upgrader::bulk_upgrade()` for a plugin that is already at the latest version in the same way it is handled for themes. 
This corrects a fragile check of the result in `wp_ajax_update_plugin()` that depended on the internal array pointer, and brings some consistency with `wp_ajax_update_theme()`.

Follow-up to [37714], [48401].
See #50448.
Built from https://develop.svn.wordpress.org/trunk@48445


git-svn-id: http://core.svn.wordpress.org/trunk@48214 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-07-12 01:16:05 +00:00
Sergey Biryukov 81a001117c Docs: Improve documentation for `sanitize_user()`, `sanitize_title()`, `sanitize_title_with_dashes()`. 
See #49572.
Built from https://develop.svn.wordpress.org/trunk@48444


git-svn-id: http://core.svn.wordpress.org/trunk@48213 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-07-12 01:13:02 +00:00
Sergey Biryukov ea718c3f40 Tests: Ignore EOL differences in email tests using multiline string assertions. 
Unix vs. Windows EOL style mismatches can cause misleading failures in tests using the heredoc syntax (`<<<`) or multiline strings as the expected result.

Follow-up to [46612], [48033].

Props davidbaumwald.
See #31432, #41750.
Built from https://develop.svn.wordpress.org/trunk@48443


git-svn-id: http://core.svn.wordpress.org/trunk@48212 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-07-11 23:29:03 +00:00
Sergey Biryukov 2123efcc12 Docs: Correct comments in `tests/formatting/WPSlash.php` per the documentation standards. 
See #49572.
Built from https://develop.svn.wordpress.org/trunk@48442


git-svn-id: http://core.svn.wordpress.org/trunk@48211 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-07-11 22:52:05 +00:00
Sergey Biryukov c38f99df9a Docs: Synchronize `@since` notes for `add_magic_quotes()` and `wp_slash()`. 
Follow-up to [48205], [48433].

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


git-svn-id: http://core.svn.wordpress.org/trunk@48210 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-07-11 22:48:07 +00:00
Sergey Biryukov f2a7a5e154 Bootstrap/Load: Adjust the logic in `add_magic_quotes()` for better readability. 
Follow-up to [48205].

See #48605.
Built from https://develop.svn.wordpress.org/trunk@48440


git-svn-id: http://core.svn.wordpress.org/trunk@48209 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-07-11 22:44:05 +00:00
Sergey Biryukov b640c0692e Menus: Simplify the test for `wp_update_nav_menu_item()` with special characters in category name. 
The `menu-item-title` value is saved as a `post_title` property, so the resulting property can be checked directly, without a callback.

Follow-up to [48416].

See #48011.
Built from https://develop.svn.wordpress.org/trunk@48439


git-svn-id: http://core.svn.wordpress.org/trunk@48208 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-07-11 21:48:04 +00:00
Sergey Biryukov f718b4b6ec Revisions: Restore the return value of `wp_get_post_autosave()` to the documented type of `WP_Post` for backward compatibility. 
Follow-up to [48422].

See #34560.
Built from https://develop.svn.wordpress.org/trunk@48438


git-svn-id: http://core.svn.wordpress.org/trunk@48207 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-07-11 21:15:06 +00:00
TimothyBlynJacobs a59fb4e50f REST API: Sanitize block renderer attributes. 
In [48069] the Block Renderer was changed to register a single route for all dynamic blocks. Validation was dynamically applied based on the requested block, but sanitization was not. This commit adds the same sanitization back to the block attributes.

Props manooweb.
Fixes #50620. See #48079.

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


git-svn-id: http://core.svn.wordpress.org/trunk@48206 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-07-11 20:34:05 +00:00
Sergey Biryukov 7b61df725e Revisions: Replace `array_shift()` with `reset()` in `register_and_do_post_meta_boxes()` for better performance. 
Follow-up to [31829], [48422].

See #34560.
Built from https://develop.svn.wordpress.org/trunk@48436


git-svn-id: http://core.svn.wordpress.org/trunk@48205 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-07-11 12:30:02 +00:00
Sergey Biryukov 463644fc6d Coding Standards: Use strict type check for `in_array()` in `wp-includes/feed.php`. 
Additionally:
* Correct inline comments per the documentation standards.
* Correct the `@ticket` reference in `tests/feed/atom.php`.

Follow-up to [48429].

See #33591.
Built from https://develop.svn.wordpress.org/trunk@48435


git-svn-id: http://core.svn.wordpress.org/trunk@48204 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-07-11 12:14:06 +00:00
whyisjake 5ccd0f963c Build/Test Tools: Bump lodash as part of an npm audit. 
lodash 4.17.17 👉 4.17.19

See #49768.

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


git-svn-id: http://core.svn.wordpress.org/trunk@48203 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-07-11 00:36:23 +00:00
whyisjake 7448ce4839 Formatting: Prevent wp_slash from returning non-strings as strings. 
If a bool/float/int is passed into wp_slash it will be coerced into a string.

This changes the behavior to only slash strings. At the same time, handles recursion a little nicer by calling array_map for arrays.

Fixes #42195, #24106.

Props johnbillion, andizer, jrf, ryotasakamoto, SergeyBiryukov, donmhico, TobiasBg, markoheijnen, ryan, nacin, devesine, whyisjake.


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


git-svn-id: http://core.svn.wordpress.org/trunk@48202 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-07-11 00:13:04 +00:00
whyisjake 919729508c Formatting: Improve the docblock for `sanitize_title()`. 
Since sanitize title is largely used for html attributes, or post slugs, make note that accents will be removed and that the string will be limited to alphanumeric characters, underscores, and dashes.

Fixes #33756.
Props ericlewis, swissspidy, wonderboymusic, psdtohtmlguru, DrewAPicture, SergeyBiryukov, sjmur, gma992, shulard, ebinnion, whyisjake.


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


git-svn-id: http://core.svn.wordpress.org/trunk@48201 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-07-10 23:28:04 +00:00
whyisjake 5e4d204023 Coding Standards: Ensure strict type check. 
See [48429], #33591.

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


git-svn-id: http://core.svn.wordpress.org/trunk@48200 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-07-10 23:15:04 +00:00
Andrew Ozz af35cbeee8 Media: Tiny logic fix in `wp_image_file_matches_image_meta()` after [48329]. No need to look in `sizes` if the full size image path/URL matches. 
See #50543.
Built from https://develop.svn.wordpress.org/trunk@48430


git-svn-id: http://core.svn.wordpress.org/trunk@48199 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-07-10 23:06:04 +00:00
whyisjake f06e883d01 Feeds: Ensure that enclosures produce valid XML. 
Metadata that is stored on newlines has the possibility of missing values, so rather then coercing values, we can check for them and then implicity set the values.

Fixes #33591.
Props jonnybot, stevenkword, vtieu, birgire, SergeyBiryukov, davidbaumwald, rebasaurus, whyisjake.


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


git-svn-id: http://core.svn.wordpress.org/trunk@48198 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-07-10 22:23:04 +00:00
Sergey Biryukov a6fed0173d Themes: Correct closing tag for the "Enable auto-updates" button in the JS template for theme auto-update setting. 
Follow-up to [48418].

See #50516.
Built from https://develop.svn.wordpress.org/trunk@48428


git-svn-id: http://core.svn.wordpress.org/trunk@48197 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-07-10 22:03:04 +00:00
Sergey Biryukov 4645084c09 Docs: Improve description for the JS function that hides the update button for expired plugin or theme uploads. 
Add missing `@since` tag.

Follow-up to [48417].

See #50612.
Built from https://develop.svn.wordpress.org/trunk@48427


git-svn-id: http://core.svn.wordpress.org/trunk@48196 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-07-10 21:15:03 +00:00
Sergey Biryukov 8ef38d34fc Docs: Improve `@return` tags for various conditional tags. 
Props stevenlinx, SergeyBiryukov.
Fixes #50626.
Built from https://develop.svn.wordpress.org/trunk@48426


git-svn-id: http://core.svn.wordpress.org/trunk@48195 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-07-10 20:23:06 +00:00
Sergey Biryukov 376435ac9a Sitemaps: Remove some extra space from `WP_Sitemaps_Stylesheet::get_stylesheet_css()`. 
Follow-up to [48414].

See #50449.
Built from https://develop.svn.wordpress.org/trunk@48425


git-svn-id: http://core.svn.wordpress.org/trunk@48194 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-07-10 16:12:03 +00:00
Sergey Biryukov 51856d435b Administration: Bring some consistency to handling list table view modes. 
* Remove duplicate variables and DocBlocks.
* Add missing description for the `$mode` global.
* Use sentence case for "Compact view" and "Extended view" labels.

Follow-up to [48398], [48423].

Props afercia, Offereins, SergeyBiryukov.
See #49715.
Built from https://develop.svn.wordpress.org/trunk@48424


git-svn-id: http://core.svn.wordpress.org/trunk@48193 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-07-10 16:04:05 +00:00
Sergey Biryukov 0f92086ca0 Administration: Make some adjustments to `WP_Screen::render_view_mode()`: 
* Restore the `$mode` global for backward compatibility.
* Remove redundant check, as `$mode` is already set at this point, and already defaults to `list` via `get_user_setting()`'s second argument.
* Use sentence case for "View mode" and "Extended view" labels.

Follow-up to [48398].

See #49715.
Built from https://develop.svn.wordpress.org/trunk@48423


git-svn-id: http://core.svn.wordpress.org/trunk@48192 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-07-10 16:02:05 +00:00
Adam Silverstein 7d0162bc2e Revisions: optimize performance when post has large number of revisions. 
Improve speed and reduce the memory footprint when loading posts with many revisions.

* Use a direct query in `wp_get_post_autosave` to avoid loading all revisions.
* Query for IDs vs full objects in `register_and_do_post_meta_boxes`.

Props pdfernhout, johnnyb, miqrogroove, ocean90, senatorman, DBrumbaugh10Up, martijn-van-der-kooij, pavelevap, mackensen, mikeyarce, whyisjake.
Fixes #34560.


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


git-svn-id: http://core.svn.wordpress.org/trunk@48191 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-07-10 15:13:07 +00:00
Sergey Biryukov 3df6964fc8 Coding Standards: Use strict comparison in `WP_List_Util::filter()`. 
Correct comments per the documentation standards.

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


git-svn-id: http://core.svn.wordpress.org/trunk@48190 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-07-10 12:46:09 +00:00
Sergey Biryukov b03053eb2a Docs: Correct documentation for `customize_controls_head` hook and `_customizer_mobile_viewport_meta()` function. 
Follow-up to [48412].

See #47369.
Built from https://develop.svn.wordpress.org/trunk@48420


git-svn-id: http://core.svn.wordpress.org/trunk@48189 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-07-10 11:36:07 +00:00
whyisjake edb4943a9d Administration: Better align labels on the discussion options page. 
The labels for Comment Moderation, and Comment Blocklist are now aligned properly with the adjacent text.

Fixes #37384.
Props ankit-k-gupta, karmatosed, FolioVision, desrosj, valentinbora, samful, whyisjake.

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


git-svn-id: http://core.svn.wordpress.org/trunk@48188 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-07-10 06:48:06 +00:00
whyisjake 28a390c2b2 Upgrade/Install: Use ARIA button class on plugin and theme auto-updates action links 
According to the [accesability guidelines](https://developer.wordpress.org/coding-standards/wordpress-coding-standards/accessibility/#semantics-for-controls), the control should be a link when JavaScript is not available and a button the rest of the time.

In addition, handlers were added for spacebar usage, and some changes to the a11y speak verbiage.

Fixes #50516.
Props ryokuhi, audrasjb, afercia, whyisjake/



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


git-svn-id: http://core.svn.wordpress.org/trunk@48187 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-07-10 06:18:04 +00:00
whyisjake 836ad98276 Upgrade/Install: Ensure cleanup after canceled update. 
Ensure that the uploaded zip is hidden from the media library, where a task will remove failed installs after two hours.

Fixes #50612.

Props psykro, desrosj, joyously, azaozz, noisysocks, whyisjake. 

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


git-svn-id: http://core.svn.wordpress.org/trunk@48186 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-07-10 06:08:06 +00:00
whyisjake 2c3672d2d1 Menus: Ensure that category menus with special characters can be updated. 
Slashes and HTML encoding could cause some menus not to be updated.

Fixes #48011.

Props zaheerahmad, achyuthajoy, desrosj, pento, SergeyBiryukov, donmhico, audrasjb, birgire, mikeschroder.


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


git-svn-id: http://core.svn.wordpress.org/trunk@48185 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-07-10 06:00:08 +00:00
whyisjake 9397ad46ba Coding Standards: Some missed code formatting. 
Unprops: whyisjake.


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


git-svn-id: http://core.svn.wordpress.org/trunk@48184 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-07-10 01:01:03 +00:00
whyisjake 68e56464c4 Sitemaps: Add better support for RTL sites. 
While the URLs are intended to be machine readable, they should always be LTR, while other data would be RTL in the sitemap.

Fixes #50449.

Props joyously, SergeyBiryukov, pbiron. apedog, ramiy.


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


git-svn-id: http://core.svn.wordpress.org/trunk@48183 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-07-10 00:50:04 +00:00
whyisjake 35257c2e2d Formatting: Ensure that wp_filter_object_list() will return an array when being passed an object with magic methods. 
Fixes #50095.

Props johnjamesjacoby.

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


git-svn-id: http://core.svn.wordpress.org/trunk@48182 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-07-10 00:31:06 +00:00
whyisjake 1158166d9c Administration: Remove multiple viewport meta tags from mobile pages. 
In addition, add the `wp_admin_viewport_meta()` function, paired to the `admin_viewport_meta` filter to control attributes of the meta tag.

Fixes #47369.
Props BettyJJ, mukesh27, SergeyBiryukov, ajayghaghretiya1, msaggiorato, talldanwp, davidbaumwald, donmhico, audrasjb.


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


git-svn-id: http://core.svn.wordpress.org/trunk@48181 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-07-09 23:29:08 +00:00
Sergey Biryukov d322fb66de Docs: Synchronize and correct documentation for various metadata functions and filters. 
Follow-up to [47390], [47611], [48192], [48402].

See #49572, #43941, #45464.
Built from https://develop.svn.wordpress.org/trunk@48411


git-svn-id: http://core.svn.wordpress.org/trunk@48180 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-07-09 11:26:07 +00:00
Sergey Biryukov c4a2b9a9e4 Widgets: Adjust formatting for displaying the closing `</nav>` tag in widgets for consistency with the opening tag. 
Follow-up to [48349].

See #48170.
Built from https://develop.svn.wordpress.org/trunk@48410


git-svn-id: http://core.svn.wordpress.org/trunk@48179 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-07-08 13:44:04 +00:00
Sergey Biryukov 6fc76c162d Widgets: Correct the logic for displaying the `after_widget` parameter of the Archives widget. 
Follow-up to [48349].

Props mukesh27, joyously.
Fixes #50609.
Built from https://develop.svn.wordpress.org/trunk@48409


git-svn-id: http://core.svn.wordpress.org/trunk@48178 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-07-08 13:28:03 +00:00
Sergey Biryukov 6bf6bc451f Docs: Miscellaneous DocBlock corrections. 
See #49572.
Built from https://develop.svn.wordpress.org/trunk@48408


git-svn-id: http://core.svn.wordpress.org/trunk@48177 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-07-08 13:15:03 +00:00
Sergey Biryukov 755766f286 Docs: Further improve documentation for `have_posts()` and `have_comments()`. 
Follow-up to [48406]

Props stevenlinx.
See #50610.
Built from https://develop.svn.wordpress.org/trunk@48407


git-svn-id: http://core.svn.wordpress.org/trunk@48176 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-07-08 11:15:04 +00:00
Sergey Biryukov 3311bc8783 Docs: Improve documentation for `have_posts()`, `have_comments()`, and their `WP_Query` counterparts. 
Props stevenlinx.
Fixes #50610.
Built from https://develop.svn.wordpress.org/trunk@48406


git-svn-id: http://core.svn.wordpress.org/trunk@48175 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-07-08 11:11:04 +00:00
Sergey Biryukov c358ba7112 Upgrade/Install: Prevent the upgrade routine for updating the `comment_type` field in the comments table from running twice. 
Follow-up to [47597], [48400].

See #50413, #49236.
Built from https://develop.svn.wordpress.org/trunk@48405


git-svn-id: http://core.svn.wordpress.org/trunk@48174 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-07-08 10:58:05 +00:00