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

40878 Commits

Author SHA1 Message Date
Sergey Biryukov 2900bb8ea7 Docs: Update links to https://secure.php.net/, they now redirect to https://www.php.net/. 
See #48303.
Built from https://develop.svn.wordpress.org/trunk@47088


git-svn-id: http://core.svn.wordpress.org/trunk@46888 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-01-20 03:14:06 +00:00
Sergey Biryukov f9b0dfbb8b Docs: Correct description for `shortcode_atts_{$shortcode}` filter. 
Props glebkema.
Fixes #49225.
Built from https://develop.svn.wordpress.org/trunk@47087


git-svn-id: http://core.svn.wordpress.org/trunk@46887 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-01-19 13:41:08 +00:00
Sergey Biryukov bb5765e951 Mail: Remove angle brackets from password reset URL in emails sent by `retrieve_password()` and `wp_new_user_notification()`. 
The brackets were originally added in [16285] per W3C recommendation in https://www.w3.org/Addressing/URL/5.1_Wrappers.html to avoid wrapping the URL across multiple lines in plain text in older email clients.

This doesn't seem like a common issue in modern email clients, and the current implementation causes more issues than it solves. Since the URL is on a line by itself, it should not require any delimiters.

The URL in recovery mode email introduced in [44973] doesn't have angle brackets, so it's time to retire them in password reset email too if they're not used consistently.

Props donmhico, Otto42, sproutchris, iandunn, dd32, DaveWP196, sebastian.pisula, tommix, sablednah, julian.kimmig, Rahe, clayisland, arenddeboer, nicole2292, nagoke, squarecandy, eatingrules, SergeyBiryukov.
Fixes #21095, #23578, #44589.
Built from https://develop.svn.wordpress.org/trunk@47086


git-svn-id: http://core.svn.wordpress.org/trunk@46886 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-01-18 02:32:06 +00:00
Sergey Biryukov 89f5d3dd0c Networks and Sites: Clarify the recommendation to remove the `www` prefix from the site domain before creating a network. 
The `siteurl` option reference was not quite clear, and the string actually refers to the domain name, not the full URL.

Props kharisblank, tobifjellner, ramiy.
Fixes #49214.
Built from https://develop.svn.wordpress.org/trunk@47085


git-svn-id: http://core.svn.wordpress.org/trunk@46885 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-01-18 01:15:04 +00:00
Sergey Biryukov 053a9cd5b8 Docs: Improve comments in some `wp-admin` files per the documentation standards. 
Props passoniate.
Fixes #49215, #49216.
Built from https://develop.svn.wordpress.org/trunk@47084


git-svn-id: http://core.svn.wordpress.org/trunk@46884 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-01-18 00:54:04 +00:00
Sergey Biryukov 1cfc32af58 Coding Standards: Remove unnecessary `// phpcs:ignore` instances in `WP_Debug_Data`. 
`WP_Theme::__get()` accepts `Name`, `Version`, and `Author` theme properties in lower case too.

Additionally, remove one short ternary instance, not allowed per the coding standards.

See #49222.
Built from https://develop.svn.wordpress.org/trunk@47083


git-svn-id: http://core.svn.wordpress.org/trunk@46883 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-01-18 00:26:06 +00:00
Sergey Biryukov 0f47f2b9e5 Widgets: Remove extra padding from number inputs in Recent Posts and Recent Comments widgets. 
Props marcio-zebedeu, audrasjb, SergeyBiryukov.
Fixes #49195.
Built from https://develop.svn.wordpress.org/trunk@47082


git-svn-id: http://core.svn.wordpress.org/trunk@46882 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-01-17 13:57:03 +00:00
Sergey Biryukov 82f41c5afc Date/Time: Add some basic tests for `current_time()`. 
Props pbearne, talldanwp, SergeyBiryukov.
Fixes #34378.
Built from https://develop.svn.wordpress.org/trunk@47081


git-svn-id: http://core.svn.wordpress.org/trunk@46881 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-01-17 02:52:05 +00:00
Sergey Biryukov d84c987e16 Tests: Replace `date()` with `gmdate()` in `WP_Test_REST_Posts_Controller` tests. 
Follow-up to [45424], [46252].

See #46438, #44491, #39953.
Built from https://develop.svn.wordpress.org/trunk@47080


git-svn-id: http://core.svn.wordpress.org/trunk@46880 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-01-17 02:04:04 +00:00
Sergey Biryukov 5c358b8f19 Tests: Update the `wp_maybe_decline_date()` tests for [47078]. 
See #48934.
Built from https://develop.svn.wordpress.org/trunk@47079


git-svn-id: http://core.svn.wordpress.org/trunk@46879 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-01-17 01:16:04 +00:00
Sergey Biryukov a370d1a9c0 Date/Time: Pass the date format to `wp_maybe_decline_date()`. 
This ensures that the function has enough context to determine the necessity of replacing the month name with the correct form in locales that require it.

Props SergeyBiryukov, Rarst.
Fixes #48934.
Built from https://develop.svn.wordpress.org/trunk@47078


git-svn-id: http://core.svn.wordpress.org/trunk@46878 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-01-17 01:12:04 +00:00
Sergey Biryukov e884aca67b Tests: Revert [47076], this should have been committed with the related changes to the function. 
Built from https://develop.svn.wordpress.org/trunk@47077


git-svn-id: http://core.svn.wordpress.org/trunk@46877 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-01-17 01:10:04 +00:00
Sergey Biryukov c883c65e3c Tests: Move `wp_maybe_decline_date()` tests to the `date` directory. 
See #48934.
Built from https://develop.svn.wordpress.org/trunk@47076


git-svn-id: http://core.svn.wordpress.org/trunk@46876 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-01-17 00:56:07 +00:00
Sergey Biryukov 45286c5bb3 Accessibility: Login and Registration: Add a `role="main"` landmark to the container div in `wp-signup.php`. 
Props SteelWagstaff, audrasjb.
Fixes #48657.
Built from https://develop.svn.wordpress.org/trunk@47075


git-svn-id: http://core.svn.wordpress.org/trunk@46875 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-01-16 03:44:05 +00:00
Sergey Biryukov 06f90e098a Login and Registration: Remove duplicate `<label>` tag from `show_blog_form()` in `wp-signup.php`. 
Props vaishalipanchal, audrasjb.
Fixes #49174.
Built from https://develop.svn.wordpress.org/trunk@47074


git-svn-id: http://core.svn.wordpress.org/trunk@46874 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-01-16 00:34:05 +00:00
Sergey Biryukov 691adde1e6 Date/Time: Use `wp_date()` to display the correct time of the next DST transition in Timezone setting on General Settings screen. 
Props Rarst, autotutorial.
Fixes #49038.
Built from https://develop.svn.wordpress.org/trunk@47073


git-svn-id: http://core.svn.wordpress.org/trunk@46873 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-01-16 00:28:06 +00:00
Sergey Biryukov 3e68a63e6a Editor: Correct vertical alignment for "Published on" month dropdown in Classic Editor. 
Props pratik-jain, justinahinon, audrasjb.
Fixes #49115.
Built from https://develop.svn.wordpress.org/trunk@47072


git-svn-id: http://core.svn.wordpress.org/trunk@46872 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-01-15 18:31:07 +00:00
Sergey Biryukov 57fbd3c847 File Editor: Remove extra padding on submit button for "Select plugin/theme to edit" dropdown on smaller screens. 
Props passoniate.
Fixes #49197.
Built from https://develop.svn.wordpress.org/trunk@47071


git-svn-id: http://core.svn.wordpress.org/trunk@46871 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-01-15 00:23:07 +00:00
Sergey Biryukov 569ff9dd27 Upgrade/Install: Correct vertical alignment for "Continue" button on language selection during the install process. 
Props garrett-eclipse, audrasjb.
Fixes #49018.
Built from https://develop.svn.wordpress.org/trunk@47070


git-svn-id: http://core.svn.wordpress.org/trunk@46870 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-01-14 01:11:03 +00:00
Sergey Biryukov 10ae398727 Site Health: Avoid "Undefined property" PHP notices in `wp_dashboard_site_health()` when the status result transient does not exist yet. 
Props dlh for initial patch.
See #47606.
Built from https://develop.svn.wordpress.org/trunk@47069


git-svn-id: http://core.svn.wordpress.org/trunk@46869 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-01-13 17:27:06 +00:00
Sergey Biryukov 4a9c0e35e1 Cron API: Use `WEEK_IN_SECONDS` constant for the `weekly` schedule added in [47062]. 
Props afercia.
See #47606.
Built from https://develop.svn.wordpress.org/trunk@47068


git-svn-id: http://core.svn.wordpress.org/trunk@46868 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-01-13 17:05:07 +00:00
Sergey Biryukov f18b173674 Networks and Sites: Use `warning` styles for 'Caution' and 'Warning' messages during Multisite installation. 
Props dlh.
Fixes #49186.
Built from https://develop.svn.wordpress.org/trunk@47067


git-svn-id: http://core.svn.wordpress.org/trunk@46867 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-01-13 17:00:06 +00:00
Sergey Biryukov 9fa4cce9c2 Docs: Correct description for `show_in_admin_all_list` and `show_in_admin_status_list` arguments of `register_post_status()`. 
Props audrasjb.
Fixes #49180.
Built from https://develop.svn.wordpress.org/trunk@47066


git-svn-id: http://core.svn.wordpress.org/trunk@46866 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-01-13 00:50:02 +00:00
Sergey Biryukov fa2f6e0644 Docs: Improve documentation for `wp_save_image_file()` and related functions. 
See #48303.
Built from https://develop.svn.wordpress.org/trunk@47065


git-svn-id: http://core.svn.wordpress.org/trunk@46865 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-01-12 16:56:05 +00:00
Sergey Biryukov 810a243f2d Tests: In `Tests_Site_Health`, create a `WP_Site_Health` instance before clearing the cron array, as the constructor schedules its own task now. 
See #47606.
Built from https://develop.svn.wordpress.org/trunk@47064


git-svn-id: http://core.svn.wordpress.org/trunk@46864 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-01-12 14:18:03 +00:00
Sergey Biryukov 2c4480958b Site Health: Introduce Site Health Status dashboard widget. 
The widget informs administrators of any potential issues that should be addressed to improve the performance or security of their website, and directs them to the Site Health screen for more details.

Props Clorith, hedgefield, guddu1315.
See #47606.
Built from https://develop.svn.wordpress.org/trunk@47063


git-svn-id: http://core.svn.wordpress.org/trunk@46863 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-01-12 13:33:05 +00:00
Sergey Biryukov 26ce3c9f19 Cron API: Add a new cron schedule for `weekly` events. 
Props Clorith.
See #47606.
Built from https://develop.svn.wordpress.org/trunk@47062


git-svn-id: http://core.svn.wordpress.org/trunk@46862 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-01-12 11:20:04 +00:00
Sergey Biryukov f8a5ae6b93 Upgrade/Install: Remove the suggestion for users to skip a minor update to keep their current translation. 
With the introduction of asynchronous translation updates in WordPress 3.7+, the suggestion is no longer relevant.

Props casiepa, danieltj, tobifjellner, netweb.
Fixes #43242.
Built from https://develop.svn.wordpress.org/trunk@47061


git-svn-id: http://core.svn.wordpress.org/trunk@46861 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-01-12 02:24:03 +00:00
Sergey Biryukov dd4d98a368 Docs: In various `@return` tags, list the expected type first, instead of `false`. 
Follow-up to [46696].

See #48303.
Built from https://develop.svn.wordpress.org/trunk@47060


git-svn-id: http://core.svn.wordpress.org/trunk@46860 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-01-11 18:32:05 +00:00
Sergey Biryukov 2294d65753 Docs: Synchronize `@return` descriptions for `::handle_row_actions()` methods in list tables. 
Make sure `WP_Comments_List_Table::handle_row_actions()` and `WP_MS_Sites_List_Table::handle_row_actions()` return a string, for consistency with other classes.

See #49170, #48303.
Built from https://develop.svn.wordpress.org/trunk@47059


git-svn-id: http://core.svn.wordpress.org/trunk@46859 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-01-11 17:59:04 +00:00
Sergey Biryukov d469aa8162 Docs: Correct `@return` description for `WP_List_Table::handle_row_actions()`. 
Props pbiron.
Fixes #49170.
Built from https://develop.svn.wordpress.org/trunk@47058


git-svn-id: http://core.svn.wordpress.org/trunk@46858 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-01-11 17:57:03 +00:00
Sergey Biryukov 6a3deacf86 Docs: Correct `@return` type for `Theme_Upgrader::check_parent_theme_filter()`. 
Props diddledan.
Fixes #48570.
Built from https://develop.svn.wordpress.org/trunk@47057


git-svn-id: http://core.svn.wordpress.org/trunk@46857 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-01-11 02:46:05 +00:00
Sergey Biryukov 77aa5d1604 Docs: Remove a reference to WordPress 2.7 from `readme.html`. 
Props afercia, donmhico.
Fixes #47963.
Built from https://develop.svn.wordpress.org/trunk@47056


git-svn-id: http://core.svn.wordpress.org/trunk@46856 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-01-10 14:05:05 +00:00
Sergey Biryukov a94ed9baf3 Docs: Remove `@return void` from widget DocBlocks. 
Per the documentation standards, it should not be used outside of the default bundled themes.

See #48303.
Built from https://develop.svn.wordpress.org/trunk@47055


git-svn-id: http://core.svn.wordpress.org/trunk@46855 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-01-10 00:30:05 +00:00
Sergey Biryukov d784ebbcb4 Coding Standards: Use strict comparison and Yoda conditions in the root directory files. 
Props pikamander2.
Fixes #48965.
Built from https://develop.svn.wordpress.org/trunk@47054


git-svn-id: http://core.svn.wordpress.org/trunk@46854 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-01-09 00:55:05 +00:00
desrosj a24f5ccd1f Bundled Themes: Remove duplicate `font-size` property in Twenty Twenty. 
Props ankitmaru.
Fixes #49015.


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


git-svn-id: http://core.svn.wordpress.org/trunk@46853 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-01-08 16:50:04 +00:00
Sergey Biryukov cef48881f0 Docs: Correct alphabetic order of parameters in `WP_Query::parse_query()` DocBlock. 
See #48303.
Built from https://develop.svn.wordpress.org/trunk@47052


git-svn-id: http://core.svn.wordpress.org/trunk@46852 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-01-08 12:10:04 +00:00
jorgefilipecosta 80ce372761 Block Editor: Update WordPress Packages. 
Updated packages:
@wordpress/annotations: 1.7.2 -> 1.9.0
@wordpress/api-fetch: 3.6.4 -> 3.8.0
@wordpress/block-directory: 1.0.5 -> 1.2.0
@wordpress/block-editor: 3.2.5 -> 3.4.0
@wordpress/block-library: 2.9.6 -> 2.11.0
@wordpress/blocks: 6.7.2 -> 6.9.0
@wordpress/components: 8.3.2 -> 8.5.0
@wordpress/compose: 3.7.2 -> 3.9.0
@wordpress/core-data: 2.7.5 -> 2.9.0
@wordpress/data: 4.9.2 -> 4.11.0
@wordpress/data-controls: 1.3.4 -> 1.5.0
@wordpress/date: 3.5.0 -> 3.7.0
@wordpress/dom: 2.5.2 -> 2.6.0
@wordpress/e2e-test-utils: 3.0.0 -> 4.0.0
@wordpress/edit-post: 3.8.6 -> 3.10.0
@wordpress/editor: 9.7.6 -> 9.9.0
@wordpress/element: 2.8.2 -> 2.10.0
@wordpress/escape-html: 1.5.1 -> 1.6.0
@wordpress/format-library: 1.9.5 -> 1.11.0
@wordpress/i18n: 3.6.1 -> 3.7.0
@wordpress/keycodes: 2.6.2 -> 2.7.0
@wordpress/list-reusable-blocks: 1.8.4 -> 1.10.0
@wordpress/media-utils: 1.2.4 -> 1.4.0
@wordpress/notices: 1.8.2 -> 1.10.0
@wordpress/nux: 3.7.2 -> 3.9.0
@wordpress/plugins: 2.7.2 -> 2.9.0
@wordpress/rich-text: 3.7.2 -> 3.9.0
@wordpress/scripts: 6.0.0 -> 6.1.1
@wordpress/server-side-render: 1.3.4 -> 1.5.0
@wordpress/shortcode: 2.4.1 -> 2.5.0
@wordpress/token-list: 1.6.1 -> 1.8.0
@wordpress/url: 2.8.2 -> 2.9.0
@wordpress/viewport: 2.8.2 -> 2.10.0

Props gziolo, youknowriad.
Fixes #49142.
Built from https://develop.svn.wordpress.org/trunk@47051


git-svn-id: http://core.svn.wordpress.org/trunk@46851 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-01-08 11:57:23 +00:00
Sergey Biryukov ea6e0cc3ca Coding Standards: Use Yoda conditions in `wp-includes/rest-api/endpoints/class-wp-rest-users-controller.php`. 
Props jenilk.
Fixes #49150.
Built from https://develop.svn.wordpress.org/trunk@47050


git-svn-id: http://core.svn.wordpress.org/trunk@46850 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-01-08 11:32:02 +00:00
Sergey Biryukov 967f43a6cb Docs: Indicate that `load_script_textdomain_relative_path` filter value can be `false`. 
See #48303.
Built from https://develop.svn.wordpress.org/trunk@47049


git-svn-id: http://core.svn.wordpress.org/trunk@46849 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-01-08 00:27:04 +00:00
gziolo 572f1725d9 Build Tools: do not include assets for JS dependencies that do not exist. 
This is a follow-up for #48154, where we started including *.asset.php files to declare package dependencies.
This works well but creates warnings in environments where the package does not exist because WordPress was not fully built.

Props jeherve, swissspidy.

Fixes #49144.


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


git-svn-id: http://core.svn.wordpress.org/trunk@46848 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-01-07 15:28:05 +00:00
Sergey Biryukov d3d630c98a Site Health: Make sure the "Copied!" text is vertically centered to the "Copy site info to clipboard" button. 
Props garrett-eclipse.
Fixes #49139.
Built from https://develop.svn.wordpress.org/trunk@47047


git-svn-id: http://core.svn.wordpress.org/trunk@46847 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-01-07 00:09:04 +00:00
Sergey Biryukov ce48d7502c REST API: Display the actual conflicting value in addition to the taxonomy name in the `_doing_it_wrong()` message for a conflicting `rest_base` or `name` property. 
Follow-up to [47037] and [47045].

Props TimothyBlynJacobs.
See #48401.
Built from https://develop.svn.wordpress.org/trunk@47046


git-svn-id: http://core.svn.wordpress.org/trunk@46846 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-01-06 17:09:04 +00:00
Sergey Biryukov a540d748d3 REST API: Display the taxonomy name in the `_doing_it_wrong()` message for a conflicting `rest_base` or `name` property, to match the translator comment. 
Follow-up to [47037].

See #48401.
Built from https://develop.svn.wordpress.org/trunk@47045


git-svn-id: http://core.svn.wordpress.org/trunk@46845 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-01-06 16:47:02 +00:00
Sergey Biryukov 28639fc8d5 I18N: Replace `rest_authentication_errors` filter name with a placeholder in a translatable string. 
Follow-up to [38947] and [40038].

See #38446.
Built from https://develop.svn.wordpress.org/trunk@47044


git-svn-id: http://core.svn.wordpress.org/trunk@46844 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-01-06 16:21:04 +00:00
Sergey Biryukov 667f26b3af I18N: Replace `php.ini`, `post_max_size`, and `upload_max_filesize` with placeholders in "File is empty" error message. 
Props ramiy.
Fixes #48868.
Built from https://develop.svn.wordpress.org/trunk@47043


git-svn-id: http://core.svn.wordpress.org/trunk@46843 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-01-06 16:16:03 +00:00
Dominik Schilling 918dead27e Docs: Remove duplicate inline comment in `wp_mail()`. 
See [5639].
See #48303.
Built from https://develop.svn.wordpress.org/trunk@47042


git-svn-id: http://core.svn.wordpress.org/trunk@46842 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-01-06 14:51:05 +00:00
Sergey Biryukov 0be749362a Docs: Improve documentation for `tests/phpunit/includes/testcase-ajax.php`. 
Props andizer, SergeyBiryukov.
Fixes #47568.
Built from https://develop.svn.wordpress.org/trunk@47041


git-svn-id: http://core.svn.wordpress.org/trunk@46841 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-01-05 15:33:00 +00:00
Dominik Schilling c89dab8c98 Media: After [46375], enable JavaScript translations for the `media-views` script. 
See #49134.
Built from https://develop.svn.wordpress.org/trunk@47040


git-svn-id: http://core.svn.wordpress.org/trunk@46840 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-01-05 13:11:04 +00:00
Sergey Biryukov 6a3a0b519c Docs: Fix typo in `media_post_single_attachment_fields_to_edit()` description. 
Props mukesh27.
Fixes #49131.
Built from https://develop.svn.wordpress.org/trunk@47039


git-svn-id: http://core.svn.wordpress.org/trunk@46839 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-01-04 18:00:06 +00:00