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

40467 Commits

Author SHA1 Message Date
whyisjake 2822281c57 Themes: Fix javascript regression that linter found. 
Tests were failing from line length optimizations and double quotes. 

Fixes #37536

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


git-svn-id: http://core.svn.wordpress.org/trunk@46109 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2019-09-25 22:12:57 +00:00
whyisjake b4ab6b7e14 Menus: Duplicate Page Entry in View All Pages when generating a Menu 
Simplifies the interface in menu creation.

Fixes [37782]
Props garrett-eclipse, mdgl, birgire, xkon, audrasjb, pento, girlieworks


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


git-svn-id: http://core.svn.wordpress.org/trunk@46108 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2019-09-25 21:51:58 +00:00
whyisjake 0acc444279 Themes: Improve Twenty Fifteen sticky sidebar logic 
The current logic in TwentyFifteen (#30366) for making the sidebar sticky while still allowing to scroll through it when the sidebar height is larger than the viewport height is flawed and massively overcomplicated.
This can be mitigated by removing the admin bar specific logic and leaving most of the heavy lifting up to the browser.

Fixes #37536

Props DvanKooten, lukecavanagh, karmatosed, ianbelanger, davidbaumwald


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


git-svn-id: http://core.svn.wordpress.org/trunk@46107 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2019-09-25 21:38:58 +00:00
desrosj 285ae90032 Build/Test Tools: Remove stray `+` introduced in [45979]. 
Props david.binda.
Fixes #48127.
Built from https://develop.svn.wordpress.org/trunk@46294


git-svn-id: http://core.svn.wordpress.org/trunk@46106 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2019-09-25 19:55:58 +00:00
Andrea Fercia f8a25a89c9 Accessibility: Implement the new focus styles on the login screen after [46247]. 
Props @kjellr.
See #47153.

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


git-svn-id: http://core.svn.wordpress.org/trunk@46105 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2019-09-25 16:40:00 +00:00
Sergey Biryukov 547be72c3b Pings/Trackbacks: Use correct variable in a `foreach()` loop in `do_all_pings()`. 
Props itowhid06.
Fixes #48094. See #36824.
Built from https://develop.svn.wordpress.org/trunk@46292


git-svn-id: http://core.svn.wordpress.org/trunk@46104 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2019-09-25 15:50:58 +00:00
desrosj 6ff7ff50cd Build/Test Tools: Move Composer script command line directives to the PHPCS ruleset. 
Also, move all arguments up to the top of the custom ruleset to make it easier to understand the conditions the ruleset is run under.

Props desrosj, jrf.
See #46152.
Built from https://develop.svn.wordpress.org/trunk@46291


git-svn-id: http://core.svn.wordpress.org/trunk@46103 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2019-09-25 14:02:57 +00:00
desrosj 894e133d0c Build/Test Tools: Introduce automated PHP compatibility checking. 
This change introduces a new Composer script, `compat` that will scan the codebase for (detectable) potential PHP compatibility issues using the `PHP_CodeSniffer` and a custom ruleset based off of the `PHPCompayibilityWP` ruleset (`phpcompat.xml.dist`).

The command will be run as a separate job within each Travis build. While many compatibility issues and false positives have already been corrected in this commit and other Trac tickets, there are still some remaining. For that reason, the job is allowed to fail while the remainder of the potential compatibility issues are investigated and addressed. After those are resolved, the job should be set as required to pass to help prevent new compatibility issues from being introduced.

Props desrosj, jrf, all PHPCompatibilityWP and PHPCompatibility contributors.
Fixes #46152.
Built from https://develop.svn.wordpress.org/trunk@46290


git-svn-id: http://core.svn.wordpress.org/trunk@46102 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2019-09-25 13:47:58 +00:00
gziolo bd344c19ea Block Editor: Align the version of React with the one used in Gutenberg plugin 
Gutenberg 6.5 works with react and react-dom set to v16.9.0. This change aligns both.

Props youknowriad.
Fixes #48121.



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


git-svn-id: http://core.svn.wordpress.org/trunk@46101 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2019-09-25 08:20:57 +00:00
Sergey Biryukov c7f4cbc62c Docs: Improve consistency in `@since` tags for parameters that were made optional. 
See #47110.
Built from https://develop.svn.wordpress.org/trunk@46288


git-svn-id: http://core.svn.wordpress.org/trunk@46100 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2019-09-24 12:54:57 +00:00
Sergey Biryukov b35c5b9746 Script Loader: Add `function_exists()` checks for `is_admin()` and `current_theme_supports()`, to accomodate for using `WP_Dependencies` as a standalone class. 
Remove `<![CDATA[` when outputting HTML5 script tags. 

Props azaozz.
Fixes #42804.
Built from https://develop.svn.wordpress.org/trunk@46287


git-svn-id: http://core.svn.wordpress.org/trunk@46099 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2019-09-24 02:56:57 +00:00
desrosj c00074e6aa Post WordPress 5.3 Beta 1 version bump. 
Built from https://develop.svn.wordpress.org/trunk@46286


git-svn-id: http://core.svn.wordpress.org/trunk@46098 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2019-09-24 00:17:56 +00:00
desrosj 3bd737c1b7 WordPress 5.3 Beta 1. 
Built from https://develop.svn.wordpress.org/trunk@46285


git-svn-id: http://core.svn.wordpress.org/trunk@46097 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2019-09-23 23:54:56 +00:00
Sergey Biryukov a943fd64bc Coding Standards: Fix WPCS issue in [46283]. 
See #48110.
Built from https://develop.svn.wordpress.org/trunk@46284


git-svn-id: http://core.svn.wordpress.org/trunk@46096 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2019-09-23 23:24:57 +00:00
Sergey Biryukov 75ca249558 Twenty Twenty: Rename widget areas to `sidebar-1` and `sidebar-2`. 
This ensures that widgets are mapped correctly and is consistent with the previous default themes.

See https://github.com/WordPress/twentytwenty/issues/481.

Reverts [46282].

Props ocean90, garrett-eclipse, desrosj, SergeyBiryukov.
See #48110.
Built from https://develop.svn.wordpress.org/trunk@46283


git-svn-id: http://core.svn.wordpress.org/trunk@46095 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2019-09-23 23:17:58 +00:00
Sergey Biryukov aaa3db74d8 Tests: Correct sidebar names for Twenty Twenty. 
See #48110.
Built from https://develop.svn.wordpress.org/trunk@46282


git-svn-id: http://core.svn.wordpress.org/trunk@46094 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2019-09-23 22:04:59 +00:00
Sergey Biryukov b95b6f2c73 Site Health: Move "The folder ... was detected as being under version control" message from failure to warning. 
Props afragen, davidbaumwald.
Fixes #47982.
Built from https://develop.svn.wordpress.org/trunk@46281


git-svn-id: http://core.svn.wordpress.org/trunk@46093 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2019-09-23 21:24:56 +00:00
Sergey Biryukov 3c6ce558f9 REST API: Use delta comparison for floating date tests added in [46252] to avoid race conditions. 
See #39953.
Built from https://develop.svn.wordpress.org/trunk@46280


git-svn-id: http://core.svn.wordpress.org/trunk@46092 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2019-09-23 21:18:58 +00:00
K. Adam White 81ed396972 Posts, Post Types: Build list of "date floating" post stati dynamically when inserting post. 
Completes work begun in #39953 to expose "date floating" status information to frontend clients via the REST API.

Props TimothyBlynJacobs.
Fixes #48113.

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


git-svn-id: http://core.svn.wordpress.org/trunk@46091 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2019-09-23 21:02:56 +00:00
desrosj 098455b06f Bundled Themes: Make Twenty Twenty the new default theme. 
After being imported in [46271], Twenty Twenty can now be set as the default theme in WordPress.

See #48110.
Props desrosj, ocean90.
Built from https://develop.svn.wordpress.org/trunk@46278


git-svn-id: http://core.svn.wordpress.org/trunk@46090 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2019-09-23 21:00:58 +00:00
desrosj 1a961be653 Bundled Themes: Fix failing tests for Twenty Twenty. 
Follow up of [46271].

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


git-svn-id: http://core.svn.wordpress.org/trunk@46089 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2019-09-23 20:54:57 +00:00
Sergey Biryukov c117b9957f Site Health: Use `WP_Automatic_Updater::is_disabled()` to check whether automatic updates are disabled. 
The previous check for `DISALLOW_FILE_MODS` and `AUTOMATIC_UPDATER_DISABLED` constants didn't always provide accurate results.

Props Clorith, kraftner, afragen.
Fixes #47869.
Built from https://develop.svn.wordpress.org/trunk@46276


git-svn-id: http://core.svn.wordpress.org/trunk@46088 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2019-09-23 20:52:56 +00:00
K. Adam White a86fe08b1d Coding Standards: Fix WPCS issue in [46274]. 
See #39953.

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


git-svn-id: http://core.svn.wordpress.org/trunk@46087 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2019-09-23 20:48:57 +00:00
K. Adam White a418a8a427 REST API: Mark "pending" status as date_floating. 
See: https://github.com/WordPress/gutenberg/issues/13176

Props TimothyBlynJacobs.
Fixes #39953.

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


git-svn-id: http://core.svn.wordpress.org/trunk@46086 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2019-09-23 20:34:57 +00:00
Sergey Biryukov 406021dba8 Site Health: Include simple debug data in fatal error protection email. 
Introduce `recovery_email_debug_info` filter for the debug information included in the email.

Props Clorith, TimothyBlynJacobs.
Fixes #48090.
Built from https://develop.svn.wordpress.org/trunk@46273


git-svn-id: http://core.svn.wordpress.org/trunk@46085 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2019-09-23 20:27:56 +00:00
K. Adam White 10772e8499 REST API: Introduce WP_Post_Type::get_rest_controller() caching method to prevent unnecessary REST controller construction. 
Cache REST controller references on their associated post type object to prevent unnecessary controller re-instantiation, which previously caused "rest_prepare_{$post_type}" and "rest_{$post_type}_query" to run twice per request.

Props TimothyBlynJacobs, patrelentlesstechnologycom.
Fixes #45677.

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


git-svn-id: http://core.svn.wordpress.org/trunk@46084 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2019-09-23 20:25:57 +00:00
desrosj 43b86a246c Bundled Themes: Import Twenty Twenty, the new default theme for WordPress 5.3. 
Welcome to the bundled themes family!

Theme development to this point has taken place on GitHub. See: https://github.com/WordPress/twentytwenty/.

Props anlino, ianbelanger, audrasjb, nielslange, fabiankaegy, mukesh27, poena, joyously, emiluzelac, williampatton, dingo-d, dkarfa, acosmin, rabmalin, kafleg, jeffpaul, hareesh-pillai, burhandodhy, afercia, juanfra, soean, presskopp, justinahinon, jrf, netweb, garyj, pento, flixos90, vbaimas, zebulan, byalextran, mor10, kjellr, allancole, tdh, karmatosed, mapk, matt, andrewtaylor-1, ismailelkorchi, garrett-eclipse, gsayed786, dianeco, celloexpressions, aristath, nadir, cbravobernal, intimez, hometowntrailers, collet, littlebigthing, tobifjellner, kevinkovadia, jarretc.
See #48110.
Built from https://develop.svn.wordpress.org/trunk@46271


git-svn-id: http://core.svn.wordpress.org/trunk@46083 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2019-09-23 20:16:00 +00:00
Sergey Biryukov d363d85cce Themes: After [46164], make sure `$type_attr` is always defined in `_custom_background_cb()`. 
Props davidbaumwald.
Fixes #48112.
Built from https://develop.svn.wordpress.org/trunk@46270


git-svn-id: http://core.svn.wordpress.org/trunk@46082 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2019-09-23 20:09:57 +00:00
Sergey Biryukov 371f83cfd1 Site Health: Introduce `site_status_test_result` filter for the output of a finished Site Health test. 
Props Clorith.
Fixes #47864.
Built from https://develop.svn.wordpress.org/trunk@46269


git-svn-id: http://core.svn.wordpress.org/trunk@46081 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2019-09-23 20:04:58 +00:00
Sergey Biryukov db5f9f7a3a Site Health: Update PHP extension tests to reflect the current state of the Hosting Teams handbook recommendations. 
Props Clorith, bronsonquick, jrf, johnbillion, galbaras, mikeschroder, jorbin.
Fixes #47454.
Built from https://develop.svn.wordpress.org/trunk@46268


git-svn-id: http://core.svn.wordpress.org/trunk@46080 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2019-09-23 19:50:56 +00:00
Sergey Biryukov 9510aaecde Site Health: Improve wording for PHP update warning. 
Props danieltj, garrett-eclipse, marybaum, afragen, chetan200891.
Fixes #47644.
Built from https://develop.svn.wordpress.org/trunk@46267


git-svn-id: http://core.svn.wordpress.org/trunk@46079 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2019-09-23 19:39:58 +00:00
Sergey Biryukov 571b0e8a00 Coding Standards: Fix WPCS issue in [46262]. 
See #47952.
Built from https://develop.svn.wordpress.org/trunk@46266


git-svn-id: http://core.svn.wordpress.org/trunk@46078 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2019-09-23 19:29:57 +00:00
Sergey Biryukov 5955f0938b Privacy: Introduce `wp_privacy_personal_data_email_to` and `wp_privacy_personal_data_email_subject` filters. 
Pass email data to the `wp_privacy_personal_data_email_content` filter.

Props garrett-eclipse, thakkarhardik, birgire.
Fixes #46303.
Built from https://develop.svn.wordpress.org/trunk@46265


git-svn-id: http://core.svn.wordpress.org/trunk@46077 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2019-09-23 19:25:57 +00:00
Sergey Biryukov 255b1d6e3f Privacy: Show a success message for personal data erasure. 
Props garrett-eclipse, allendav, birgire, JoshuaWold, karmatosed, pputzer.
Fixes #44135.
Built from https://develop.svn.wordpress.org/trunk@46264


git-svn-id: http://core.svn.wordpress.org/trunk@46076 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2019-09-23 19:13:58 +00:00
John Blackbourn f14fc1392c Taxonomy: Redirect to the correct URL after deleting a taxonomy term attached to a post type other than Post. 
Props donmhico, mukesh27

Fixes #47858

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


git-svn-id: http://core.svn.wordpress.org/trunk@46075 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2019-09-23 19:10:58 +00:00
John Blackbourn 49c63c104f Build/Test tools: Ensure the `create_and_get()` factory method returns the appropriate WP_Error when creating a term fails. 
Fixes: #47952 

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


git-svn-id: http://core.svn.wordpress.org/trunk@46074 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2019-09-23 18:56:01 +00:00
desrosj bcbedd7f55 Coding Standards: Fix a coding standards issue introduced in [46254]. 
See #37392.
Built from https://develop.svn.wordpress.org/trunk@46261


git-svn-id: http://core.svn.wordpress.org/trunk@46073 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2019-09-23 18:35:00 +00:00
desrosj 2b6efccc06 External Libraries: Fix PHP 7.4 compatibility issues in the SimplePie library. 
See: 38b504969e

Props jrf, stevenkword, jorbin, desrosj.
See #47746.
Built from https://develop.svn.wordpress.org/trunk@46260


git-svn-id: http://core.svn.wordpress.org/trunk@46072 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2019-09-23 18:17:58 +00:00
Andrea Fercia 6415382aaa Fix PHP coding standards after [46251]. 
Built from https://develop.svn.wordpress.org/trunk@46259


git-svn-id: http://core.svn.wordpress.org/trunk@46071 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2019-09-23 18:12:56 +00:00
desrosj 2d29e22e56 External Libraries: Fix PHP 7.4 compatibility issues in the Requests library. 
See: https://github.com/rmccue/Requests/compare/v1.7.0...3470169

Props jrf, jorbin, desrosj.
See #47746.
Built from https://develop.svn.wordpress.org/trunk@46258


git-svn-id: http://core.svn.wordpress.org/trunk@46070 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2019-09-23 18:11:59 +00:00
Ella Iseulde Van Dorpe fbcc75a5d6 r46253: Use implode instead of join, see #47746 
Built from https://develop.svn.wordpress.org/trunk@46257


git-svn-id: http://core.svn.wordpress.org/trunk@46069 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2019-09-23 18:09:58 +00:00
Andrea Fercia 0d75495612 Login and Registration: Add a "Show password" button on the login page. 
The ability for users to see the password they're typing improves usability and accessibility of the login users flow.

- brings the login screen in line with the same feature already used in the New User, Edit User, and Reset Password pages
- improves association of labels and input fields by using explicit association with `for` / `id` attributes
- slightly increases the "Remember me" label font size

Props johnbillion, Iceable, audrasjb, joyously, adamsilverstein, boemedia, DrewAPicture, shadyvb, birgire, peterwilsoncc, pento, anevins, davidbaumwald, whyisjake, afercia.
Fixes #42888.

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


git-svn-id: http://core.svn.wordpress.org/trunk@46068 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2019-09-23 18:06:57 +00:00
Ella Iseulde Van Dorpe dad9ce2e43 Revert accidental change to package-lock.json in r46253 
Built from https://develop.svn.wordpress.org/trunk@46255


git-svn-id: http://core.svn.wordpress.org/trunk@46067 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2019-09-23 18:00:57 +00:00
johnjamesjacoby e5302dff26 Multisite/Sites: supplemental commit to r46251. 
This commit adds the links to the list-table class itself (that were missed in r46251.)

See #37392. Props pbiron, thomaswm.


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


git-svn-id: http://core.svn.wordpress.org/trunk@46066 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2019-09-23 17:51:58 +00:00
Ella Iseulde Van Dorpe 22ae908ede Editor: Add Nonce Endpoint 
This is a follow up to #47843, implementing a PHP endpoint and inline scripts 
after the editor package updates. The action was originally added in
https://github.com/WordPress/gutenberg/pull/16683.

Fixes #48076.



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


git-svn-id: http://core.svn.wordpress.org/trunk@46065 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2019-09-23 17:47:56 +00:00
K. Adam White ef86b03619 REST API: Introduce date_floating property on status endpoint response objects. 
Expose a date_floating property on all status objects to permit clients (including the block editor) to make correct decisions about date handling for posts of varying status.

Props mnelson4, earnjam, kadamwhite, jnylen0, nerrad, pento.
See #39953.


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


git-svn-id: http://core.svn.wordpress.org/trunk@46064 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2019-09-23 17:40:58 +00:00
johnjamesjacoby b65ea119bb Multisite/Sites: Add links to filter websites by status. 
This commit brings the Network-Admin Sites list page up-to-speed with other similar list-table powered pages, by adding links to filter the results by Site Status.

Includes a single unit test for the newly introduced `wp_count_sites()` multisite function, named to match the `wp_count_` function pattern from other list tables.

Fixes #37392. Props mnelson4, spacedmonkey, pbiron.


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


git-svn-id: http://core.svn.wordpress.org/trunk@46063 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2019-09-23 17:35:59 +00:00
Andrea Fercia 956725990f Accessibility: Make sortable meta boxes non sortable when there are no locations they can be dragged to. 
Depending on the amount of meta boxes and the layout settings under Screen Options, sortable meta boxes may not be actually sortable.
In these cases, jQuery UI sortable needs to be disabled and the user interface shouldn't use a CSS `cursor: move`.

The use of consistent and relevant cursors may be important for users who have a cognitive disability, since cursors give a visual clue as to an element's functionality. Using the move cursor for elements which cannot be moved may be confusing or counter-intuitive for users.

Props adamsilverstein, antpb, anevins.
Fixes #47131.

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


git-svn-id: http://core.svn.wordpress.org/trunk@46062 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2019-09-23 17:30:58 +00:00
K. Adam White b15c0d410e REST API: Pass "null" as the post date property to reset post to initial "floating" date value. 
Props TimothyBlynJacobs, adamsilverstein, jnylen0, mnelson4.
Fixes #44975.


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


git-svn-id: http://core.svn.wordpress.org/trunk@46061 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2019-09-23 17:25:57 +00:00
Andrea Fercia 6cb8e14790 Accessibility: Improve and modernize user interface controls. Sixth part: allow checkboxes and radio buttons to scale with text. 
- uses a SVG icon for checkboxes
- uses CSS `rem` relative units

Props kjellr, afercia, audrasjb.
Fixes #47498.

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


git-svn-id: http://core.svn.wordpress.org/trunk@46060 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2019-09-23 16:51:57 +00:00