Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-12-27 11:38:01 +01:00
Code Issues Projects Releases Wiki Activity
41,760 Commits 50 Branches 749 Tags 806 MiB
ec571bdcf6
Commit Graph

41760 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Sergey Biryukov
2c19aee6d5 Login and Registration: Introduce lostpassword_errors filter in retrieve_password() for errors encountered on a password reset request. 
This complements the `registration_errors` filter in `register_new_user()`.

Props wpdo5ea, dilipbheda.
Fixes #49521.
Built from https://develop.svn.wordpress.org/trunk@48084


git-svn-id: http://core.svn.wordpress.org/trunk@47851 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-06-18 20:24:09 +00:00
Sergey Biryukov
05e28b4d7c Coding Standards: Use strict comparison for JS fragment in wp-admin/admin-header.php. 
Props subrataemfluence.
Fixes #45810.
Built from https://develop.svn.wordpress.org/trunk@48083


git-svn-id: http://core.svn.wordpress.org/trunk@47850 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-06-18 20:08:09 +00:00
Sergey Biryukov
8d3075952e Administration: Combine the styles for <p> and .wp-die-message, instead of duplicating. 
This brings some consistency with `_default_wp_die_handler()`, where they are already combined.

Follow-up to [45909].

See #47580.
Built from https://develop.svn.wordpress.org/trunk@48082


git-svn-id: http://core.svn.wordpress.org/trunk@47849 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-06-18 15:07:11 +00:00
Sergey Biryukov
168a9df672 Coding Standards: Fix WPCS issues in wp-includes/sitemaps/. 
Some of these were not caught when running `composer lint:errors`, but are fixed when running `phpcbf` directly.

Follow-up to [48072], [48080].

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


git-svn-id: http://core.svn.wordpress.org/trunk@47848 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-06-18 14:46:09 +00:00
Sergey Biryukov
e1bd050cb9 Coding Standards: Remove unused variable in WP_Sitemaps_Provider::get_sitemap_entries(). 
Follow-up to [48072].

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


git-svn-id: http://core.svn.wordpress.org/trunk@47847 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-06-18 14:44:07 +00:00
Pascal Birchler
fcd890e546 Sitemaps: Bump $wp_db_version to flush rewrite rules after [48072]. 
Props ocean90.
See #50117.

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


git-svn-id: http://core.svn.wordpress.org/trunk@47846 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-06-18 11:26:17 +00:00
Andrew Ozz
d61790f9dc Fix empty line phpcs error. 
See #50280.
Built from https://develop.svn.wordpress.org/trunk@48078


git-svn-id: http://core.svn.wordpress.org/trunk@47845 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-06-18 00:46:09 +00:00
Andrew Ozz
7757ad5e94 Plugins and Themes Auto-Updates: allow overriding of the HTML for the auto-update setting link. This will let plugins show better/specific information when they are overriding the auto-update settings, for example "Updates are managed by ... plugin". 
Introduces: `theme_auto_update_setting_html`, `plugin_auto_update_setting_html`, and `theme_auto_update_setting_template` filters.

Props audrasjb, pbiron, azaozz.
Fixes #50280.
Built from https://develop.svn.wordpress.org/trunk@48077


git-svn-id: http://core.svn.wordpress.org/trunk@47844 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-06-18 00:00:13 +00:00
Sergey Biryukov
cb72d22d67 Menus: Check the correct variable in Walker_Nav_Menu_Edit::start_el() when menu item is a taxonomy term. 
Follow-up to [45891].

Props ashour.
Fixes #50415.
Built from https://develop.svn.wordpress.org/trunk@48076


git-svn-id: http://core.svn.wordpress.org/trunk@47843 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-06-17 19:47:14 +00:00
Sergey Biryukov
d81302511d External Libraries: Update Moment.js to 2.26.0. 
Changelog: https://github.com/moment/moment/compare/2.22.2...2.26.0

This commit also fixes a deprecation warning regarding the usage of `moment.locale()` to set locale properties.

As of Moment.js 2.12.0, `moment.locale()` is deprecated and `moment.updateLocale()` should be used instead.

Additionally, minimize `moment.js` as part of build process to remove the source map reference.

This avoids a `sourceMappingURL` being in the minified file, as we don't ship source maps.

Props yoancutillas, SergeyBiryukov.
Fixes #50408.
Built from https://develop.svn.wordpress.org/trunk@48075


git-svn-id: http://core.svn.wordpress.org/trunk@47842 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-06-17 17:40:27 +00:00
ianbelanger
1a767ac06f Bundled Themes: Twenty Sixteen table border extends beyond table. 
Fixes issues where tables created by the table block have an extra border on the left side which extends below the table.

Props gsmumbo, mukesh27, JavierCasares.
Fixes #50180.
Built from https://develop.svn.wordpress.org/trunk@48074


git-svn-id: http://core.svn.wordpress.org/trunk@47841 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-06-17 17:27:09 +00:00
ianbelanger
48eea2481c Bundled Themes: Twenty Nineteen horizontal rule is very narrow. 
Fixes the issue by adding specific styles for the `<hr>` tag.

Props laurelfulford, nielslange, kjellr, samful, leprincenoir.
Fixes #45912.
Built from https://develop.svn.wordpress.org/trunk@48073


git-svn-id: http://core.svn.wordpress.org/trunk@47840 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-06-17 15:48:09 +00:00
Pascal Birchler
609dd1d14f Sitemaps: Add XML sitemaps functionality to WordPress. 
While web crawlers are able to discover pages from links within the site and from other sites, XML sitemaps supplement this approach by allowing crawlers to quickly and comprehensively identify all URLs included in the sitemap and learn other signals about those URLs using the associated metadata.

See https://make.wordpress.org/core/2020/06/10/merge-announcement-extensible-core-sitemaps/ for more details.

This feature exposes the sitemap index via `/wp-sitemap.xml` and exposes a variety of new filters and hooks for developers to modify the behavior. Users can disable sitemaps completely by turning off search engine visibility in WordPress admin.

This change also introduces a new `esc_xml()` function to escape strings for output in XML, as well as XML support to `wp_kses_normalize_entities()`.

Props Adrian McShane, afragen, adamsilverstein, casiepa, flixos90, garrett-eclipse, joemcgill, kburgoine, kraftbj, milana_cap, pacifika, pbiron, pfefferle, Ruxandra Gradina, swissspidy, szepeviktor, tangrufus, tweetythierry.
Fixes #50117.
See #3670. See #19998.

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


git-svn-id: http://core.svn.wordpress.org/trunk@47839 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-06-17 15:24:07 +00:00
desrosj
689fdc6319 Site Health: Verify PHP version requirements when auto-updating themes. 
Follow up of [47819].
See #49653.
Fixes #50411.
Built from https://develop.svn.wordpress.org/trunk@48071


git-svn-id: http://core.svn.wordpress.org/trunk@47838 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-06-17 14:48:07 +00:00
Sergey Biryukov
a9a6b25cae Script Loader: Include the script or style handle in _wp_scripts_maybe_doing_it_wrong() message. 
This makes the message more helpful and allows for easier debugging.

Props janthiel.
Fixes #50406.
Built from https://develop.svn.wordpress.org/trunk@48070


git-svn-id: http://core.svn.wordpress.org/trunk@47837 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-06-17 10:16:08 +00:00
TimothyBlynJacobs
41f70ae5f8 REST API: Only register one block renderer route. 
Every block has a different set of attributes. These attributes are specified as a JSON Schema object. Previously, every block registered its own block renderer route using its attributes for the schema. This allowed for the attributes to be validated using the built in endpoint validation rules. It had the unfortunate side effect, however, of creating a large number of nearly identical REST API routes, one for each dynamic block. Each registered route has a performance impact. As the number of server side blocks goes up, this becomes more and more of an issue.

Now, we register a single block renderer route and dynamically validate the attributes based on the selected block.

Fixes #48079.
Props gziolo, TimothyBlynJacobs.

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


git-svn-id: http://core.svn.wordpress.org/trunk@47836 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-06-17 03:22:12 +00:00
Sergey Biryukov
353c9bfc58 Docs: List the expected return type first for size_format() and wp_get_original_referer(). 
Follow-up to [46696], [47060].

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


git-svn-id: http://core.svn.wordpress.org/trunk@47835 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-06-16 21:24:07 +00:00
Sergey Biryukov
de59ad23a4 Docs: Consistently include an empty line between @since tag and @see, @link, or @global, per the documentation standards. 
See #49572.
Built from https://develop.svn.wordpress.org/trunk@48067


git-svn-id: http://core.svn.wordpress.org/trunk@47834 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-06-16 21:07:14 +00:00
Sergey Biryukov
8fdb0728be Text Changes: Replace "webmaster" with "site admin" in register_new_user(). 
Follow-up to [48049], accidentally reverted in [48059].

Props kebbet.
See #50394.
Built from https://develop.svn.wordpress.org/trunk@48066


git-svn-id: http://core.svn.wordpress.org/trunk@47833 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-06-16 20:05:10 +00:00
Sergey Biryukov
a8cd3a3e2c Coding Standards: Rename the $clean or $ids variable in several functions to $non_cached_ids for clarity. 
* `_get_non_cached_ids()`
* `update_meta_cache()`
* `update_object_term_cache()`

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


git-svn-id: http://core.svn.wordpress.org/trunk@47832 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-06-16 19:09:08 +00:00
ianbelanger
c5ee065c3a Bundled Themes: Twenty Seventeen pagination links don't appear for home pages. 
Fixes issues where pagination does not work on the page that is set to the home page.

Props dimitris.m, laurelfulford, poena, ianbelanger, samful.
Fixes #39685.
Built from https://develop.svn.wordpress.org/trunk@48064


git-svn-id: http://core.svn.wordpress.org/trunk@47831 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-06-16 18:40:07 +00:00
Sergey Biryukov
49edaea6f1 Coding Standards: Fix WPCS issues in wp-admin/nav-menus.php. 
Includes minor code layout fixes for better readability.

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


git-svn-id: http://core.svn.wordpress.org/trunk@47830 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-06-16 18:38:08 +00:00
whyisjake
97e2b94f84 Help/About: Add help tabs to provide informations about plugin & themes auto-updates. 
Adds language around how the feature works and includes links to the WordPress HelpHub pages.

Fixes: #50215.
Props: audrasjb, garrett-eclipse, paaljoachim, marybaum, pbiron, whyisjake.


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


git-svn-id: http://core.svn.wordpress.org/trunk@47829 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-06-16 17:29:07 +00:00
ianbelanger
5e0879db84 Bundled Themes: Twenty Seventeen Navbar z-index issue. 
Fixes navbar z-index issue by upping the z-index value to 1000 from 7.

Props halgatewood, justnorris, poena, sinatrateam.
Fixes #39384.
Built from https://develop.svn.wordpress.org/trunk@48061


git-svn-id: http://core.svn.wordpress.org/trunk@47828 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-06-16 17:16:10 +00:00
whyisjake
ed1e6c3d87 Themes: Add additional later escaping to post_class() and body_class() functions. 
Additionally, this adds a few tests to test output.

Fixes #20009.

Props mfields, scribu, azaozz, obenland, dd32, nacin, jrf, jdgrimes, garyj, whyisjake. 
 

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


git-svn-id: http://core.svn.wordpress.org/trunk@47827 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-06-16 16:57:15 +00:00
Andrea Fercia
f83c504b88 I18N: Remove the "Error:" prefix from error messages. 
For a number of years, most of the WordPress error messages have been prefixed with "Error:". However, these messages appear in a context where it's already clear an error occurred. Whether it's an error, a warning, or any other classification, that's not so relevant for users. The content of the message is the relevant part. The "Error:" prefix doesn't add great value while it does add unnecessary complexity for the message readability.

Also, revises some of these messages to improve clarity and removes HTML from translatable strings.

Props garrett-eclipse, ramiy, SergeyBiryukov, afercia, sabernhardt, quadthemes, audrasjb. 
See #47003, #43037, #42945, #15887.
Fixes #47656.

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


git-svn-id: http://core.svn.wordpress.org/trunk@47826 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-06-16 15:35:13 +00:00