Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-11-18 00:25:37 +01:00
Code Issues Projects Releases Wiki Activity
42,764 Commits 50 Branches 748 Tags 792 MiB
618fb979c6
Commit Graph

42764 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sergey Biryukov
618fb979c6 Docs: Add a reference to wp_insert_post() for information on the arguments accepted by wp_update_post(). 
See #50768.
Built from https://develop.svn.wordpress.org/trunk@49493


git-svn-id: http://core.svn.wordpress.org/trunk@49252 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-11-04 01:39:06 +00:00
noisysocks
4be65decb7 Editor: Add explicit template and template_lock attributes 
Add and document the template and template_lock attributes on WP_Post_Type that
are used by the block editor.

Props metalandcoffee.
See #46261.

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


git-svn-id: http://core.svn.wordpress.org/trunk@49251 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-11-04 01:05:10 +00:00
desrosj
107f669f15 Build/Test Tools: Disable update attempts while running unit tests. 
This fixes an issue introduced in [49369] that causes l10n related tests to fail when the PHPUnit test suite is run multiple times without hints of the site being under version control.

[49369] removed the `.git` folder from the ZIP artifact created during the initial setup job. This ZIP file is used by the later jobs in the workflow that run the test suite. The absence of the `.git` folder in these later jobs caused the language packs initially loaded from `phpunit/data/languages` folder to be updated asynchronously, resulting in unexpected values when running the tests a second time.

This change disables all Core auto-update and asynchronous language pack update attempts when running PHPUnit tests.

Props ocean90, SergeyBiryukov.
See #50401.
Fixes #51670.
Built from https://develop.svn.wordpress.org/trunk@49491


git-svn-id: http://core.svn.wordpress.org/trunk@49250 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-11-03 21:09:08 +00:00
desrosj
5392af9208 Upgrade/Install: Change the notice displayed after saving auto-update settings to .notice-success. 
This better conveys the message of the notice and brings consistency with other success notices throughout Core.

Props audrasjb.
Fixes #51701.
Built from https://develop.svn.wordpress.org/trunk@49490


git-svn-id: http://core.svn.wordpress.org/trunk@49249 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-11-03 17:55:06 +00:00
John Blackbourn
3cee52b362 Docs: Add more information about how to use filters that run before WordPress initialises. 
Fixes #50134

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


git-svn-id: http://core.svn.wordpress.org/trunk@49248 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-11-03 17:36:09 +00:00
John Blackbourn
238e69d9a6 Tests: Remove some useless assertions from the image editor tests. 
In each of these instances the variable being tested is a directly instantiated object and can never be a `WP_Error`, unlike when `wp_get_image_editor()` is used.

See #51344

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


git-svn-id: http://core.svn.wordpress.org/trunk@49247 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-11-03 15:52:11 +00:00
Sergey Biryukov
a940c08357 Docs: Document the $linkdata parameter of wp_insert_link() using hash notation. 
Props stevenlinx, peterwilsoncc.
Fixes #50853.
Built from https://develop.svn.wordpress.org/trunk@49487


git-svn-id: http://core.svn.wordpress.org/trunk@49246 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-11-03 03:52:10 +00:00
Helen Hou-Sandí
3b64a19eeb Post-WordPress 5.6 Beta 3 version bump. 
Built from https://develop.svn.wordpress.org/trunk@49486


git-svn-id: http://core.svn.wordpress.org/trunk@49245 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-11-02 21:22:04 +00:00
Helen Hou-Sandí
2f6286db83 WordPress 5.6 Beta 3. 
Built from https://develop.svn.wordpress.org/trunk@49485


git-svn-id: http://core.svn.wordpress.org/trunk@49244 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-11-02 20:59:07 +00:00
Sergey Biryukov
1543954adc Docs: Update description for the $context parameter of sanitize_title() and sanitize_title_with_dashes(). 
This brings some consistency between the two DocBlocks and adjusts the latter one per the documentation standards.

Follow-up to [49482].

See #50569.
Built from https://develop.svn.wordpress.org/trunk@49484


git-svn-id: http://core.svn.wordpress.org/trunk@49243 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-11-02 20:20:07 +00:00
Helen Hou-Sandí
a3581edd84 Upgrade/Install: Update help tab text to include major WordPress updates. 
Props audrasjb.
Fixes #51653.

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


git-svn-id: http://core.svn.wordpress.org/trunk@49242 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-11-02 20:16:06 +00:00
Helen Hou-Sandí
f2875b6f7c Formatting: Update docs for $context in sanitize_title_with_dashes(). 
Props stevenlinx, audrasjb.
Fixes #50569.

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


git-svn-id: http://core.svn.wordpress.org/trunk@49241 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-11-02 20:12:06 +00:00
desrosj
6a39c891b2 Customize: Ensure menu items expand horizontally on large screens. 
Props clorith, garrett-eclipse.
Fixes #51647.
Built from https://develop.svn.wordpress.org/trunk@49481


git-svn-id: http://core.svn.wordpress.org/trunk@49240 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-11-02 20:07:05 +00:00
Helen Hou-Sandí
da4b76c6b3 Site Health: Site errors are for *this* site, not necessarily *your* site. 
Props techboyg5, Clorith, audrasjb.
Fixes #51524.

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


git-svn-id: http://core.svn.wordpress.org/trunk@49239 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-11-02 19:55:07 +00:00
Helen Hou-Sandí
be95ec2c27 About: Optimize freedoms sprite and add 2 column layout. 
Props garrett-eclipse, ryelle.
Fixes #46363.

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


git-svn-id: http://core.svn.wordpress.org/trunk@49238 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-11-02 19:46:14 +00:00
desrosj
e0669ddaae Bundled Themes: Sync Twenty Twenty-One with the latest changes from GitHub. 
For a full list of changes since [49330], see 5759e96...e7d5991.

Props poena, luminuu, ryelle, kjellr, aristath, justinahinon, felipeelia, joostdevalk.
See #51526.
Built from https://develop.svn.wordpress.org/trunk@49478


git-svn-id: http://core.svn.wordpress.org/trunk@49237 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-11-02 19:45:07 +00:00
desrosj
e3a467a55a Upgrade/Install: Prevent removal of additional data from plugin update info. 
This switches to using `wp_parse_args()` instead of a combination of `array_merge()` and `array_intersect_key()` when ensuring that all expected default keys are present in the update information for a plugin.

This prevents non-default data returned by 3rd-party plugins from being unintentionally stripped out.

Props peterwilsoncc, chriscct7.
Fixes #51609.
Built from https://develop.svn.wordpress.org/trunk@49477


git-svn-id: http://core.svn.wordpress.org/trunk@49236 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-11-02 19:13:07 +00:00
Helen Hou-Sandí
409bd27659 Remove accidentally duplicated code introduced in [49475]. 
See #46536.

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


git-svn-id: http://core.svn.wordpress.org/trunk@49235 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-11-02 19:09:09 +00:00
Helen Hou-Sandí
340c834fa3 Privacy: More precise checking of user request action names. 
Props garrett-eclipse.
Fixes #46536.

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


git-svn-id: http://core.svn.wordpress.org/trunk@49234 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-11-02 18:42:04 +00:00
Helen Hou-Sandí
cc74786052 General: Make some inline comments more descriptive. 
Props jorbin.
Fixes #51683.

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


git-svn-id: http://core.svn.wordpress.org/trunk@49233 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-11-02 18:04:07 +00:00
noisysocks
cfa1fb8c83 Editor: Update packages 
@wordpress/block-directory@1.17.2
@wordpress/block-editor@5.1.2
@wordpress/block-library@2.26.2
@wordpress/edit-post@3.25.2
@wordpress/editor@9.24.2
@wordpress/format-library@1.25.2
@wordpress/reusable-blocks@1.0.2

Props isabel_brison.
See #51696.

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


git-svn-id: http://core.svn.wordpress.org/trunk@49232 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-11-02 04:56:37 +00:00
Sergey Biryukov
f39fc10544 Docs: Use a consistent plural form of "status". 
Props Collizo4sky, Presskopp, davidbaumwald.
Fixes #51690.
Built from https://develop.svn.wordpress.org/trunk@49472


git-svn-id: http://core.svn.wordpress.org/trunk@49231 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-11-02 01:38:07 +00:00
Sergey Biryukov
89ce61835d Upgrade/Install: Switch "Check again" link on WordPress Updates screen to sentence case. 
This brings some consistency with other text links on the screen, e.g. "View version details" for plugins or themes.

Follow-up to [49150].

Props afercia.
See #51523.
Built from https://develop.svn.wordpress.org/trunk@49471


git-svn-id: http://core.svn.wordpress.org/trunk@49230 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-11-02 01:17:09 +00:00
Sergey Biryukov
7941c32ad3 Twenty Sixteen: Ensure the <nav> elements in widgets do not affect bottom margin. 
Follow-up to [49208].

Props sabernhardt.
Fixes #51445.
Built from https://develop.svn.wordpress.org/trunk@49470


git-svn-id: http://core.svn.wordpress.org/trunk@49229 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-10-31 02:56:05 +00:00
Sergey Biryukov
4091f41a07 Twenty Fifteen: Ensure the <nav> elements in widgets do not affect bottom margin. 
Follow-up to [49208].

Props sabernhardt.
See #51445.
Built from https://develop.svn.wordpress.org/trunk@49469


git-svn-id: http://core.svn.wordpress.org/trunk@49228 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-10-31 02:54:11 +00:00
whyisjake
4b91d4e523 Upgrade/Install: During the install process, add additional checking for exising tables. 
If reinstalling WordPress, there is a condition where tables would exist in the database. Ensures that when that is the case, the install process can carry along without issue.

Fixes #51676.

Props xknown, garubi, mukesh27, desrosj, johnbillion, metalandcoffee, davidbaumwald, whyisjake.


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


git-svn-id: http://core.svn.wordpress.org/trunk@49211 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-10-30 17:52:07 +00:00
Peter Wilson
c8d5bc3c50 Taxonomy: Revert Light-weight/partial term counts. 
Partial revert of [49141], [49171], [49316].

All functional changes are removed, appropriate term counting unit tests are retained.

See #40351.

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


git-svn-id: http://core.svn.wordpress.org/trunk@49210 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-10-30 04:59:08 +00:00
Sergey Biryukov
812826a231 Tests: Remove the GLOB_BRACE flag for glob() function from unit tests. 
The flag was previously used in PDF preview tests when cleaning up temporary files.

As noted in the PHP documentation, the flag is not available on some non-GNU systems, like Solaris or Alpine Linux.

Follow-up to [40130].

Props amykamala, sawanoboly.
Fixes #51661.
Built from https://develop.svn.wordpress.org/trunk@49450


git-svn-id: http://core.svn.wordpress.org/trunk@49209 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-10-30 02:03:07 +00:00
Adam Silverstein
25918dd10b Users: Password generation - restore "Cancel" aria label after r49248. 
Restore the "Cancel" button aria label to "Cancel password change" after it was inadvertently changed in r49248.

Props SergeyBiryukov.
Fixes #42852.


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


git-svn-id: http://core.svn.wordpress.org/trunk@49151 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-10-29 18:43:06 +00:00
Adam Silverstein
b8d1d01cc5 REST API: JS Client - improve collection route construction for empty parents. 
Fix an issue where the constructed path for hierarchical collections could contain a double slash ("//") when items contained empty parents, causing an error.

Props nicomollet.
Fixes #44745.

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


git-svn-id: http://core.svn.wordpress.org/trunk@49149 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-10-29 18:32:05 +00:00
desrosj
9c5173ffa6 Themes: Ensure that only privileged users can set a background image when a theme is using the deprecated custom background page. 
Props xknown, zieladam, peterwilsoncc, whyisjake.
Merges [49379] to trunk.
Built from https://develop.svn.wordpress.org/trunk@49388


git-svn-id: http://core.svn.wordpress.org/trunk@49147 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-10-29 18:09:13 +00:00
desrosj
84a7bde414 Meta: Sanitize meta key before checking protection status. 
Props zieladam, peterwilsoncc, xknown, whyisjake.
Merges [49377,49381] to trunk.
Built from https://develop.svn.wordpress.org/trunk@49387


git-svn-id: http://core.svn.wordpress.org/trunk@49146 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-10-29 18:08:06 +00:00
desrosj
a8e86c768c Upgrade/install: Improve logic check when determining installation status. 
Improve handling of ambiguous return values to determine if a blog is installed.

Props zieladam, xknown.
Merges [49377] to trunk.
Built from https://develop.svn.wordpress.org/trunk@49386


git-svn-id: http://core.svn.wordpress.org/trunk@49145 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-10-29 18:06:13 +00:00
desrosj
d3ec258f91 XML-RPC: Return error message if attachment ID is incorrect. 
Throw an error for incorrect attachment IDs when requesting a media object to ensure return signature is correct and doesn't include incorrectly typed values within the object.

Props zieladam, peterwilsoncc, whyisjake.
Merges [49376] to trunk.
See #49905.
Built from https://develop.svn.wordpress.org/trunk@49385


git-svn-id: http://core.svn.wordpress.org/trunk@49144 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-10-29 18:05:06 +00:00
desrosj
1050613168 Coding standards: Modify escaping functions to avoid potential false positives. 
Props xknown, zieladam, peterwilsoncc.
Merges [49375] to trunk.
Built from https://develop.svn.wordpress.org/trunk@49384


git-svn-id: http://core.svn.wordpress.org/trunk@49143 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-10-29 18:03:11 +00:00
desrosj
025f5a62a2 Embeds: Disable embeds on deactivated Multisite sites. 
Props xknown, whyisjake, zieladam, peterwilsoncc.
Merges [49374] to trunk.
Built from https://develop.svn.wordpress.org/trunk@49383


git-svn-id: http://core.svn.wordpress.org/trunk@49142 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-10-29 18:02:05 +00:00
desrosj
cad4a1a3d7 External Libraries: Disable deserialization in Requests_Utility_FilteredIterator 
Props xknown, peterwilsoncc, desrosj, dd32, whyisjake.
Merges [49373] to trunk.
Built from https://develop.svn.wordpress.org/trunk@49382


git-svn-id: http://core.svn.wordpress.org/trunk@49141 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-10-29 18:00:08 +00:00
desrosj
fcc970a1cf XML-RPC: Improve error messages for unprivileged users. 
Add specific permission checks to avoid ambiguous failure messages.

Props zieladam, peterwilsoncc, xknown, whyisjake.
Built from https://develop.svn.wordpress.org/trunk@49380


git-svn-id: http://core.svn.wordpress.org/trunk@49139 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-10-29 17:44:07 +00:00
desrosj
019d838b6c Build/Test Tools: Avoid logging the same debug info twice in the PHPUnit workflow. 
Also includes some inline documentation fixes for workflow files.

See #50401.
Built from https://develop.svn.wordpress.org/trunk@49371


git-svn-id: http://core.svn.wordpress.org/trunk@49130 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-10-29 01:48:04 +00:00
Sergey Biryukov
a9a1146a71 REST API: Remove accidentally duplicated key in test fixtures. 
Follow-up to [49334], [49368].

See #51638.
Built from https://develop.svn.wordpress.org/trunk@49370


git-svn-id: http://core.svn.wordpress.org/trunk@49129 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-10-29 01:34:05 +00:00
desrosj
813fb756ae Build/Test Tools: Use install-changed to install NPM dependencies in GitHub Action workflows. 
The `install-changed` package records a hash of the `package.json` file locally in a text file and only runs `npm install` when there are changes to account for. 

This builds on [47497], which only hashes the `package.json` file after a Grunt task is called. By using `npx install-changed` within the workflow files, the package is hashed before the first Grunt task is run.

Props ocean90.
See #50401, #49594.
Built from https://develop.svn.wordpress.org/trunk@49369


git-svn-id: http://core.svn.wordpress.org/trunk@49128 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-10-29 01:22:04 +00:00
Sergey Biryukov
36dcf727f4 REST API: Regenerate test fixtures after [49334]. 
Props garrett-eclipse.
Fixes #51638.
Built from https://develop.svn.wordpress.org/trunk@49368


git-svn-id: http://core.svn.wordpress.org/trunk@49127 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-10-29 01:02:06 +00:00
Sergey Biryukov
bb0b36a905 Themes: Clarify the _doing_it_wrong() message for post formats in add_theme_support(). 
Follow-up to [49344], [49354], [49365].

See #51390.
Built from https://develop.svn.wordpress.org/trunk@49367


git-svn-id: http://core.svn.wordpress.org/trunk@49126 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-10-29 00:08:06 +00:00
Sergey Biryukov
99e83a11d0 Tests: Correct post formats registration in WP_REST_Search_Controller tests. 
When declaring theme support for the `post-formats` feature, an array of supported post formats needs to be specified.

Follow-up to [49344], [49354].

Props garrett-eclipse.
Fixes #51390.
Built from https://develop.svn.wordpress.org/trunk@49365


git-svn-id: http://core.svn.wordpress.org/trunk@49125 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-10-29 00:03:05 +00:00
desrosj
9b8fe28242 Build/Test Tools: Allow the desired version of PHPUnit to be passed to the local Docker environment. 
This reintroduces [49358] with a modification to the `.travis.yml` file to avoid an issue with `dotenv-expand` being unable to expand variables into `process.env` only on Travis.

The `LOCAL_PHPUNIT` environment variabl allows the desired version of PHPUnit to be specified when running the PHP tests within the local Docker environment.

Because support for newer versions of PHPUnit is not backported, some versions of PHP need the ability to run multiple versions of PHPUnit for different branches. This adds the flexibility needed to use the Docker environment within those older branches to run the PHP tests.

Props johnbillion, SergeyBiryukov.
See #50042.
Built from https://develop.svn.wordpress.org/trunk@49362


git-svn-id: http://core.svn.wordpress.org/trunk@49122 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-10-28 23:17:23 +00:00
desrosj
76f6f20d41 Build/Test Tools: Revert [49358] to investigate failures. 
Unprops desrosj.
See #50042.
Built from https://develop.svn.wordpress.org/trunk@49360


git-svn-id: http://core.svn.wordpress.org/trunk@49120 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-10-28 19:44:21 +00:00
whyisjake
dbae445997 Embeds: Remove Facebook and Instagram as an oEmbed Source 
Facebook has depracated all non-authenticated endpoints for Facebook and Instagram. 

See: https://developers.facebook.com/docs/plugins/oembed-legacy
See also: https://make.wordpress.org/core/2020/09/22/facebook-and-instagram-embeds-to-be-deprecated-october-24th/

With this change, endpoints are being removed. If a site is dependent on this feature, they need to pass either an app or client token. There are a few plugins that add this functionality.

Fixes #50861.
Props johnbillion, joyously, mkaz, dimadin, ayeshrajans, davisshaver, paaljoachim, Clorith, bridgetwillard, jb510, sippis, Clorith, TimothyBlynJacobs, desrosj, smub, audrasjb, whyisjake.

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


git-svn-id: http://core.svn.wordpress.org/trunk@49119 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-10-28 19:11:06 +00:00
desrosj
41d5f153c5 Build/Test Tools: Allow the desired version of PHPUnit to be passed to the local Docker environment. 
This change introduces the `LOCAL_PHPUNIT` environment variable that allows the desired version of PHPUnit to be specified when running the PHP tests within the local Docker environment.

Because support for newer versions of PHPUnit is not backported, some versions of PHP need the ability to run multiple versions of PHPUnit for different branches. This adds the flexibility needed to use the Docker environment within those older branches to run the PHP tests.

Props johnbillion.
Fixes #50042.
Built from https://develop.svn.wordpress.org/trunk@49358


git-svn-id: http://core.svn.wordpress.org/trunk@49118 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-10-28 19:03:25 +00:00
John Blackbourn
1aafbf6c6f Cron API: Improve the inline documentation for the args passed to the cron event scheduling functions. 
Props chadreitsma, peterwilsoncc

Fixes #51605

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


git-svn-id: http://core.svn.wordpress.org/trunk@49117 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-10-28 18:37:07 +00:00
Sergey Biryukov
e569358678 General: Ensure that filtered arguments in get_search_form() contain all required default values. 
Props kellybleck, davidbaumwald, whyisjake, SergeyBiryukov.
Fixes #51645.
Built from https://develop.svn.wordpress.org/trunk@49355


git-svn-id: http://core.svn.wordpress.org/trunk@49115 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-10-28 16:57:08 +00:00