Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-11-03 09:21:03 +01:00
Code Issues Projects Releases Wiki Activity
41,395 Commits 50 Branches 747 Tags 785 MiB
aa69c25d5f
Commit Graph

41395 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
desrosj
a72e30d847 External Libraries: Update the SimplePie library to the latest version (1.5.5). 
This brings SimplePie in sync with the most up to date version, 1.5.5.

This update brings many bug fixes, small enhancements, and PHP compatibility fixes for newer versions of PHP.

For a full list of changes, see https://github.com/simplepie/simplepie/blob/master/CHANGELOG.md#155-may-1-2020.

Props dshanske, slushman, etruel, wpshades, dmenard, desrosj, hareesh-pillai, stevenkword, jrf, Ipstenu, johnbillion.
Fixes #36669.
Built from https://develop.svn.wordpress.org/trunk@47733


git-svn-id: http://core.svn.wordpress.org/trunk@47509 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-05-01 14:26:07 +00:00
desrosj
7f5686d40e Build/Test Tools: Introduce a command for restarting the local Docker environment. 
This change introduces the `env:restart` command for easier restarting of the local Docker environment.

Props desrosj, ianbelanger.
Fixes #50039.

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


git-svn-id: http://core.svn.wordpress.org/trunk@47507 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-04-30 20:22:06 +00:00
desrosj
8959d57ceb Reverting [47728]. 
Unprops desrosj.
See #50039.
Built from https://develop.svn.wordpress.org/trunk@47729


git-svn-id: http://core.svn.wordpress.org/trunk@47506 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-04-30 20:17:09 +00:00
desrosj
4a6383a2da -username=desrosj 
Built from https://develop.svn.wordpress.org/trunk@47728


git-svn-id: http://core.svn.wordpress.org/trunk@47505 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-04-30 19:55:07 +00:00
Sergey Biryukov
eae1462bef Canonical: Redirect paged requests for non-paginated posts to the post permalink. 
This avoids displaying duplicate content of the same post under different URLs and ensures the canonical URL is correct.

Previously, requests for invalid page numbers were only redirected to the post permalink if the post was actually paginated using the `<!--nextpage-->` marker.

Follow-up to [34492].

Props jeremyfelt, prografika, sachit.tandukar, subrataemfluence, hronak, ekatherine, henry.wright, chesio, dd32, SergeyBiryukov.
Fixes #40773. See #45337, #28081, #11694.
Built from https://develop.svn.wordpress.org/trunk@47727


git-svn-id: http://core.svn.wordpress.org/trunk@47504 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-04-30 12:05:14 +00:00
Sergey Biryukov
8ca76cabfc Help/About: Revert [47699] from trunk. 
Built from https://develop.svn.wordpress.org/trunk@47706


git-svn-id: http://core.svn.wordpress.org/trunk@47483 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-04-29 18:44:11 +00:00
whyisjake
cf8bd373fe Update the about page for WordPress 5.4.1 
Built from https://develop.svn.wordpress.org/trunk@47699


git-svn-id: http://core.svn.wordpress.org/trunk@47476 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-04-29 18:37:05 +00:00
ianbelanger
b1a318f3bd Bundled Themes: Twenty Twenty image caption is not aligned center when image is, on the front-end. 
Fixes the image caption alignment issue by adding `text-align: center;` to `.wp-block-image .aligncenter figcaption`.

Props markusthiel, SergeyBiryukov, garethgillman.
Fixes #49320.
Built from https://develop.svn.wordpress.org/trunk@47689


git-svn-id: http://core.svn.wordpress.org/trunk@47466 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-04-29 18:19:05 +00:00
Sergey Biryukov
800b71ca31 Coding Standards: Fix WPCS issues in tests/formatting/SanitizeFileName.php. 
Follow-up to [47638].
Built from https://develop.svn.wordpress.org/trunk@47664


git-svn-id: http://core.svn.wordpress.org/trunk@47441 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-04-29 17:26:18 +00:00
Sergey Biryukov
266b52513b Docs: Correct @since versions, remove duplicate comment. 
Follow-up to [47633].
Built from https://develop.svn.wordpress.org/trunk@47663


git-svn-id: http://core.svn.wordpress.org/trunk@47440 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-04-29 17:25:10 +00:00
Dominik Schilling
dbc054bec2 Bump Akismet external to 4.1.5. 
git-svn-id: http://core.svn.wordpress.org/trunk@47428 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-04-29 16:35:23 +00:00
whyisjake
fd21a9346c Formatting: Expand sanitize_file_name to have better support for utf8 characters. 
Props: xknown, peterwilsoncc.

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


git-svn-id: http://core.svn.wordpress.org/trunk@47413 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-04-29 15:40:07 +00:00
whyisjake
c16fa7c73d Cache API: Ensure proper escaping around the stats method in the cache API. 
Props: nickdaugherty, batmoo, whyisjake, westi.

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


git-svn-id: http://core.svn.wordpress.org/trunk@47412 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-04-29 15:36:06 +00:00
whyisjake
94f5dc0cad Block Editor: Coding standards, properly escape class names. 
Props: aduth, noisysocks, pento, talldanwp, jorgefilipecosta, whyisjake, ellatrix, ehti.

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


git-svn-id: http://core.svn.wordpress.org/trunk@47411 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-04-29 15:34:09 +00:00
whyisjake
3ee9488292 Query: Ensure that only a single post can be returned on date/time based queries. 
Props: sstoqnov, peterwilsoncc.

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


git-svn-id: http://core.svn.wordpress.org/trunk@47410 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-04-29 15:28:04 +00:00
whyisjake
f7b4147bea User: Invalidate user_activation_key on password update. 
Props: sstoqnov, sergeybiryukov.


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


git-svn-id: http://core.svn.wordpress.org/trunk@47409 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-04-29 15:25:07 +00:00
whyisjake
55cd633c37 Customize: Add additional filters to Customizer to prevent JSON corruption. 
This solution extends the wp_insert_post_data filter to pass in addition to the slashed/sanitized/processed data, and the slashed/sanitized/unprocessed data, to also pass the initial slashed/unsanitized/unprocessed data which was passed into wp_insert_post(). This then allows plugins to have complete control over how sanitization is performed based on the post type.

Props westonruter, peterwilsoncc, sstoqnov, whyisjake, xknown.
 

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


git-svn-id: http://core.svn.wordpress.org/trunk@47408 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-04-29 15:14:10 +00:00
Sergey Biryukov
3dc1e33fb5 Networks and Sites: Link to Nginx documentation on Network Setup screen when Nginx is in use. 
Props lipathor, audrasjb, johnbillion, flixos90.
Fixes #41166.
Built from https://develop.svn.wordpress.org/trunk@47632


git-svn-id: http://core.svn.wordpress.org/trunk@47407 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-04-29 14:43:09 +00:00
Sergey Biryukov
0da2c98ddc Docs: Correct @return type for WP_Theme::get_post_templates(). 
The method returns an array of strings, not a single string.

Props mayankmajeji, salvatore.formisano.
Fixes #50020.
Built from https://develop.svn.wordpress.org/trunk@47631


git-svn-id: http://core.svn.wordpress.org/trunk@47406 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-04-28 15:02:11 +00:00
Sergey Biryukov
5371e3fd62 Site Health: Avoid a PHP notice in WP_Site_Health::wp_cron_scheduled_check() if async test response does not contain the expected result. 
Additionally, avoid a PHP notice in `::get_test_php_version()` if the minimum recommended version of PHP could not be determined.

Props schlessera, oakesjosh.
Fixes #49943.
Built from https://develop.svn.wordpress.org/trunk@47628


git-svn-id: http://core.svn.wordpress.org/trunk@47403 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-04-27 22:01:08 +00:00
TimothyBlynJacobs
352cb55cca REST API: Support the (min|max)Length JSON Schema keywords. 
Props sorenbronsted.
Fixes #48820.

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


git-svn-id: http://core.svn.wordpress.org/trunk@47402 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-04-27 02:29:07 +00:00
Sergey Biryukov
e55ca10ddc Comments: Ensure that inserting a comment with an empty type results in correct comment type. 
Add unit tests for `wp_handle_comment_submission()` and `wp_insert_comment()` receiving an empty type.

Follow-up to [47597].

Props ocean90, imath.
Fixes #49236.
Built from https://develop.svn.wordpress.org/trunk@47626


git-svn-id: http://core.svn.wordpress.org/trunk@47401 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-04-26 13:44:07 +00:00
Sergey Biryukov
6b5087812c Comments: Restore inclusion of an empty comment type when building the WHERE clause in WP_Comment_Query::get_comment_ids(). 
This ensures that `get_comments( array( 'type' => 'comment' ) )` still includes comments that have not yet migrated to the `comment` type.

Follow-up to [47597].

Props ocean90.
See #49236.
Built from https://develop.svn.wordpress.org/trunk@47625


git-svn-id: http://core.svn.wordpress.org/trunk@47400 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-04-26 13:14:06 +00:00
Sergey Biryukov
77eb929b52 Upgrade/Install: Introduce wp_in_maintenance_mode(), a helper function to check if WordPress is currently in maintenance mode. 
Props Clorith.
Fixes #49959.
Built from https://develop.svn.wordpress.org/trunk@47623


git-svn-id: http://core.svn.wordpress.org/trunk@47398 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-04-25 20:19:07 +00:00
Sergey Biryukov
43cfa7ee60 Administration: Remove right padding on form tables on smaller screens so that the spacing is equal on both sides. 
Additionally, reduce the right margin on screen meta links (Help and Screen Options) to align with the tables.

Props jainnidhi, garrett-eclipse, ibdz, SergeyBiryukov.
Fixes #43279.
Built from https://develop.svn.wordpress.org/trunk@47622


git-svn-id: http://core.svn.wordpress.org/trunk@47397 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-04-25 12:27:11 +00:00
ianbelanger
72ef7ee315 Bundled Themes: Twenty Twenty remove unnecessary $css_dependencies variable in twentytwenty_block_editor_styles(). 
Removes the unnecessary `$css_dependencies` variable in `twentytwenty_block_editor_styles()`.

Props ocean90, Dency.
Fixes #49986.
Built from https://develop.svn.wordpress.org/trunk@47618


git-svn-id: http://core.svn.wordpress.org/trunk@47393 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-04-24 14:59:07 +00:00
Sergey Biryukov
ced8fb20a1 Code Modernization: Remove error suppression from parse_url() calls. 
Previously, the `@` operator was used to prevent possible warnings emitted by `parse_url()` in PHP < 5.3.3 when URL parsing failed.

Now that the minimum version of PHP required by WordPress is 5.6.20, this is no longer needed.

Props netpassprodsr, Howdy_McGee.
Fixes #49980. See #24780.
Built from https://develop.svn.wordpress.org/trunk@47617


git-svn-id: http://core.svn.wordpress.org/trunk@47392 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-04-24 07:28:10 +00:00
Sergey Biryukov
0dc461c72e Networks and Sites: Don't display an empty Menu Settings section in network admin if there are no items. 
This accounts for returning an empty array from the `mu_menu_items` filter.

Props dlh.
Fixes #49977.
Built from https://develop.svn.wordpress.org/trunk@47616


git-svn-id: http://core.svn.wordpress.org/trunk@47391 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-04-23 18:58:05 +00:00
Sergey Biryukov
b6c70b7712 Embeds: Fix incorrect usage of get_home_url() in oEmbed tests. 
Switch to `home_url()` for consistency with other tests and to avoid confusion.

Props david.binda.
Fixes #49988.
Built from https://develop.svn.wordpress.org/trunk@47615


git-svn-id: http://core.svn.wordpress.org/trunk@47390 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-04-23 18:41:07 +00:00
ianbelanger
f97ac354c6 Bundled Themes: Twenty Twenty button styles produce inconsistent output and cannot be edited. 
Fixes the issue with button styles not working when the Gutenberg plugin is activated while maintaining backwards compatibility.

Props nrqsnchz, poena, kjellr.
Fixes #49896.
Built from https://develop.svn.wordpress.org/trunk@47614


git-svn-id: http://core.svn.wordpress.org/trunk@47389 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-04-23 15:41:09 +00:00
ianbelanger
4632322382 Bundled Themes: Twenty Twenty resized images are centered inside the editor (with no alignment set) since WordPress 5.4. 
Fixes the image alignment issue by removing `margin-left: auto;` and `margin-right: auto;` from `.editor-styles-wrapper .wp-block-image.is-resized`.

Props dianeco, JavierCasares.
Fixes #49600.
Built from https://develop.svn.wordpress.org/trunk@47613


git-svn-id: http://core.svn.wordpress.org/trunk@47388 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-04-22 19:25:08 +00:00
desrosj
a753e44d4e Bootstrap/Load: Deprecate wp_unregister_GLOBALS(). 
The `register_globals` directive in PHP was deprecated in version 5.3 and removed entirely in 5.4.

Now that WordPress only supports PHP 5.6.20 and newer, the `wp_unregister_GLOBALS()` function can be deprecated.

Props ayeshrajans, desrosj, SergeyBiryukov.
Fixes #49938.
Built from https://develop.svn.wordpress.org/trunk@47612


git-svn-id: http://core.svn.wordpress.org/trunk@47387 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-04-22 15:42:09 +00:00
Sergey Biryukov
427405535f Docs: Synchronize parameter documentation for various metadata functions, update per the documentation standards. 
See #49572.
Built from https://develop.svn.wordpress.org/trunk@47611


git-svn-id: http://core.svn.wordpress.org/trunk@47386 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-04-22 10:31:09 +00:00
Sergey Biryukov
9aa0fff80e Docs: Document the default value of $single and $prev_value parameters in various metadata functions. 
Props denisco.
See #49572.
Built from https://develop.svn.wordpress.org/trunk@47610


git-svn-id: http://core.svn.wordpress.org/trunk@47385 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-04-22 09:40:10 +00:00
ianbelanger
29abe5c726 Bundled Themes: Twenty Twenty submenu items disappear underneath the Cover block. 
Fixes the submenu issue by raising the z-index value of the site-header from 1 to 2.

Props kjellr, JavierCasares.
Fixes #49322.
Built from https://develop.svn.wordpress.org/trunk@47609


git-svn-id: http://core.svn.wordpress.org/trunk@47384 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-04-21 20:06:08 +00:00
ianbelanger
116a9b3039 Bundled Themes: Twenty Twenty missed license for images. 
Fixes the image license in the readme by removing screenshot.png.

Props h71, poena.
Fixes #49316.
Built from https://develop.svn.wordpress.org/trunk@47608


git-svn-id: http://core.svn.wordpress.org/trunk@47383 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-04-21 19:43:09 +00:00
ianbelanger
c9ea34b6b3 Bundled Themes: Twenty Twenty block editor inserter is missing the +. 
Fixes the disappearing `+` in the block editor when using the latest version of the Gutenberg plugin, by adding support for the native Gutenberg editor styles and removing `color: inherit;` from Twenty Twenty's style.css.

Props nrqsnchz, .
Fixes #49610.
Built from https://develop.svn.wordpress.org/trunk@47607


git-svn-id: http://core.svn.wordpress.org/trunk@47382 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-04-21 19:17:08 +00:00
Sergey Biryukov
6c243b4b0a Networks and Sites: Display the Site Address field on Add Site screen in left-to-right text direction. 
Props ramiy.
Fixes #49949.
Built from https://develop.svn.wordpress.org/trunk@47606


git-svn-id: http://core.svn.wordpress.org/trunk@47381 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-04-21 11:26:07 +00:00
Sergey Biryukov
b4373fafe9 Menus: Remove unused commented out code in wp-admin/nav-menus.php. 
Props garrett-eclipse, audrasjb.
Fixes #49967.
Built from https://develop.svn.wordpress.org/trunk@47605


git-svn-id: http://core.svn.wordpress.org/trunk@47380 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-04-21 09:02:08 +00:00
Sergey Biryukov
589666abc3 External Libraries: Revert [47603]. 
With the Docker image for PHP 7.4 updated to stable version, this should no longer be necessary.

See https://github.com/WordPress/wpdev-docker-images/pull/26

Props ocean90.
Fixes #49945.
Built from https://develop.svn.wordpress.org/trunk@47604


git-svn-id: http://core.svn.wordpress.org/trunk@47379 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-04-20 15:41:08 +00:00
Sergey Biryukov
e9e5d8e2b2 External Libraries: Comment out magic quote functions in getID3(). 
For some reason, the `version_compare()` check does not work as expected on Travis.

Follow-up to [46113], [47601].

See #49945.
Built from https://develop.svn.wordpress.org/trunk@47603


git-svn-id: http://core.svn.wordpress.org/trunk@47378 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-04-20 12:12:06 +00:00
Sergey Biryukov
1bac2cbe66 External Libraries: Backport a commit from getID3() trunk to fix a PHP 7.4+ notice. 
This addresses a "Trying to access array offset on value of type bool" notice in the `getid3_mp3::MPEGaudioHeaderValid()` method.

Props schlessera.
Fixes #49945.
Built from https://develop.svn.wordpress.org/trunk@47602


git-svn-id: http://core.svn.wordpress.org/trunk@47377 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-04-20 11:34:07 +00:00
Sergey Biryukov
694bec2071 External Libraries: Update getID3() to 1.9.19. 
Changelog: https://github.com/JamesHeinrich/getID3/compare/v1.9.18...v1.9.19

Props ayeshrajans, schlessera.
See #49945.
Built from https://develop.svn.wordpress.org/trunk@47601


git-svn-id: http://core.svn.wordpress.org/trunk@47376 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-04-20 11:13:07 +00:00
Sergey Biryukov
71dea21c5f Users: Change "Your Profile" and "My Profile" links in admin menu and toolbar to just "Profile" for consistency. 
Props donmhico, bcworkz, seanchayes, mikeschroder, garrett-eclipse, akhileshsabharwal, ScottSmith, nacin, jenmylo, afercia, swissspidy, felix-edelmann, helen, melchoyce, karmatosed.
Fixes #26769.
Built from https://develop.svn.wordpress.org/trunk@47600


git-svn-id: http://core.svn.wordpress.org/trunk@47375 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-04-20 08:39:06 +00:00
Sergey Biryukov
30a35a4806 Upload: Better align file input and buttons in plugin/theme upload form. 
Follow-up to [47271].

Props seedsca, piyushmca.
Fixes #49914.
Built from https://develop.svn.wordpress.org/trunk@47599


git-svn-id: http://core.svn.wordpress.org/trunk@47374 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-04-19 09:47:08 +00:00
Sergey Biryukov
ee387b9181 Accessibility: Widgets: Prevent checkboxes in widget control forms from overlapping on smaller screens. 
Props jaz_on, milindmore22, passoniate, audrasjb, carriganvb, afercia, SergeyBiryukov.
Fixes #49228.
Built from https://develop.svn.wordpress.org/trunk@47598


git-svn-id: http://core.svn.wordpress.org/trunk@47373 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-04-18 07:03:09 +00:00
Sergey Biryukov
61a2f62ffd Comments: Use comment instead of an empty string for the comment_type DB field value in comments table. 
This is the first step to bring support for custom comment types into WordPress.

Add a scheduled upgrade routine to update the type value for existing comments, in batches of 100 at a time.

Props imath, aaroncampbell, jeremyfelt, dshanske.
Fixes #49236.
Built from https://develop.svn.wordpress.org/trunk@47597


git-svn-id: http://core.svn.wordpress.org/trunk@47372 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-04-17 19:35:06 +00:00
Sergey Biryukov
012b134b23 Coding Standards: Fix WPCS indentation issue in wp-admin/nav-menus.php. 
This was causing a `PEAR.Functions.FunctionCallSignature.Indent` error if PHP_CodeSniffer 3.5.3 or newer is installed locally, despite the task passing on Travis.

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


git-svn-id: http://core.svn.wordpress.org/trunk@47371 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-04-17 18:55:09 +00:00
Sergey Biryukov
af1a737b48 Coding Standards: Fix WPCS indentation issue in wp-admin/includes/class-wp-links-list-table.php. 
This was causing a `Generic.WhiteSpace.ScopeIndent.IncorrectExact` error if PHP_CodeSniffer 3.4.1 or newer is installed locally, despite the task passing on Travis.

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


git-svn-id: http://core.svn.wordpress.org/trunk@47370 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-04-17 18:31:07 +00:00
ianbelanger
cf9b35eccd Bundled Themes: Twenty Twenty fix typo in readme.txt. 
Fixed TikTok was misspelled as Tik Tok in the readme.txt.

Props Asif2BD.
Fixes #49932.
Built from https://develop.svn.wordpress.org/trunk@47594


git-svn-id: http://core.svn.wordpress.org/trunk@47369 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-04-17 15:47:08 +00:00