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

40899 Commits

Author SHA1 Message Date
Sergey Biryukov b8d10d8b63 Docs: Improve documentation for `add_user_to_blog()`, `add_existing_user_to_blog()`, and `add_new_user_to_blog()`. 
See #48303.
Built from https://develop.svn.wordpress.org/trunk@47109


git-svn-id: http://core.svn.wordpress.org/trunk@46909 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-01-24 17:20:07 +00:00
Andrea Fercia 6b4368669d Toolbar: Remove leftover `@since` notations after [46678]. 
See #19647.

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


git-svn-id: http://core.svn.wordpress.org/trunk@46908 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-01-23 12:59:06 +00:00
Sergey Biryukov c67b2c235a Cache API: Remove `WP_Object_Cache::__destruct()` and `wpdb::__destruct()`. 
Originally added in [4686], these constructor/destructor pairings were designed to prevent the objects from being destroyed before shutdown, when output buffers are flushed.

A deeper investigation reveals that this approach didn't quite work as expected and was later made redundant by introducing `wp_ob_end_flush_all()` in [5462].

Props wonderboymusic, nacin, Mte90, SergeyBiryukov.
Fixes #21402.
Built from https://develop.svn.wordpress.org/trunk@47107


git-svn-id: http://core.svn.wordpress.org/trunk@46907 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-01-23 00:27:05 +00:00
jorgefilipecosta 48299521c6 Block Editor: Update WordPress Packages. 
The following package versions were changed:
@wordpress/a11y: 2.5.1 -> 2.6.0
@wordpress/annotations: 1.9.0 -> 1.10.0
@wordpress/api-fetch: 3.8.0 -> 3.9.0
@wordpress/blob: 2.5.1 -> 2.6.0
@wordpress/block-directory: 1.2.0 -> 1.3.0
@wordpress/block-editor: 3.4.0 -> 3.5.0
@wordpress/block-library: 2.11.0 -> 2.12.0
@wordpress/blocks: 6.9.0 -> 6.10.0
@wordpress/components: 8.5.0 -> 9.0.0
@wordpress/compose: 3.9.0 -> 3.10.0
@wordpress/core-data: 2.9.0 -> 2.10.0
@wordpress/data: 4.11.0 -> 4.12.0
@wordpress/data-controls: 1.5.0 -> 1.6.0
@wordpress/dom: 2.6.0 -> 2.7.0
@wordpress/dom-ready: 2.5.1 -> 2.6.0
@wordpress/e2e-test-utils: 4.0.0 -> 4.1.0
@wordpress/edit-post: 3.10.0 -> 3.11.0
@wordpress/editor: 9.9.0 -> 9.10.0
@wordpress/format-library: 1.11.0 -> 1.12.0
@wordpress/i18n: 3.7.0 -> 3.8.0
@wordpress/is-shallow-equal: 1.6.1 -> 1.7.0
@wordpress/keycodes: 2.7.0 -> 2.8.0
@wordpress/list-reusable-blocks: 1.10.0 -> 1.11.0
@wordpress/media-utils: 1.4.0 -> 1.5.0
@wordpress/notices: 1.10.0 -> 1.11.0
@wordpress/nux: 3.9.0 -> 3.10.0
@wordpress/plugins: 2.9.0 -> 2.10.0
@wordpress/priority-queue: 1.3.1 -> 1.4.0
@wordpress/rich-text: 3.9.0 -> 3.10.0
@wordpress/scripts: 6.1.1 -> 6.2.0
@wordpress/server-side-render: 1.5.0 -> 1.6.0
@wordpress/viewport: 2.10.0 -> 2.11.0
The following package was added:
@wordpress/keyboard-shortcuts

Props gziolo.
Fixes #49204.
Built from https://develop.svn.wordpress.org/trunk@47106


git-svn-id: http://core.svn.wordpress.org/trunk@46906 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-01-22 22:06:21 +00:00
iandunn 2974f78157 Multisite: Add `$context` parameter to `switch_blog` action. 
The action is fired by both `switch_to_blog()` and `restore_current_blog()`, and previously it was difficult for callback functions to determine which function had fired it.

Props SergeyBiryukov, johnbillion, jeremyfelt.
Fixes #49265.

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


git-svn-id: http://core.svn.wordpress.org/trunk@46905 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-01-22 20:53:05 +00:00
Sergey Biryukov f34eef4437 Docs: Expand `@return` value description for `wp_loginout()`, `wp_register()`, `get_calendar()`. 
See #48303.
Built from https://develop.svn.wordpress.org/trunk@47104


git-svn-id: http://core.svn.wordpress.org/trunk@46904 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-01-22 00:57:03 +00:00
Sergey Biryukov 6cf32058ff Docs: Expand `@return` description for `the_terms()`. 
See #48303.
Built from https://develop.svn.wordpress.org/trunk@47103


git-svn-id: http://core.svn.wordpress.org/trunk@46903 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-01-22 00:41:06 +00:00
Sergey Biryukov cfa3dc8ee8 Docs: Correct `@return` value for `parent_dropdown()`. 
Follow-up to [47100].

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


git-svn-id: http://core.svn.wordpress.org/trunk@46902 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-01-22 00:33:04 +00:00
Sergey Biryukov c3f9af4f00 Docs: Adjust documentation for some `pre_*` filters for consistency. 
See #48303.
Built from https://develop.svn.wordpress.org/trunk@47101


git-svn-id: http://core.svn.wordpress.org/trunk@46901 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-01-22 00:25:04 +00:00
Sergey Biryukov eb513c5ac8 Docs: Adjust `@return` value of `parent_dropdown()` for consistency with other dropdown functions. 
See #48303.
Built from https://develop.svn.wordpress.org/trunk@47100


git-svn-id: http://core.svn.wordpress.org/trunk@46900 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-01-22 00:22:03 +00:00
Sergey Biryukov 381df97419 Docs: Correct `@return` value for `update_core()` and `Core_Upgrader::upgrade()`. 
See #48303.
Built from https://develop.svn.wordpress.org/trunk@47099


git-svn-id: http://core.svn.wordpress.org/trunk@46899 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-01-22 00:19:04 +00:00
Sergey Biryukov 46dd0a79f6 Date/Time: In `wp_maybe_decline_date()`, add support for a range of days, e.g. `February 21–23`. 
A potential use case is displaying multi-day events in the WordPress Events and News dashboard widget.

See #47798, #48934.
Built from https://develop.svn.wordpress.org/trunk@47098


git-svn-id: http://core.svn.wordpress.org/trunk@46898 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-01-21 23:48:04 +00:00
Sergey Biryukov 95f5cecd77 Docs: Expand `@return` value description for `wp_nav_menu()`. 
See #48303.
Built from https://develop.svn.wordpress.org/trunk@47097


git-svn-id: http://core.svn.wordpress.org/trunk@46897 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-01-21 20:13:05 +00:00
Sergey Biryukov dd79e6e107 Docs: Correct DocBlock formatting for filters accepting the `$parsed_args` parameter. 
Follow-up to [45667].

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


git-svn-id: http://core.svn.wordpress.org/trunk@46896 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-01-21 15:41:04 +00:00
Sergey Biryukov 185e36d428 I18N: Merge duplicate "you must be logged in to comment" strings. 
Props ramiy.
Fixes #49251.
Built from https://develop.svn.wordpress.org/trunk@47095


git-svn-id: http://core.svn.wordpress.org/trunk@46895 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-01-21 14:52:06 +00:00
Sergey Biryukov 6730b3f716 I18N: Synchronize MediaElement.js translation strings with the currently bundled version. 
Some strings were previously removed in [43345] and accidentally reintroduced in [44163].

Props ramiy.
Fixes #49249. See #42139, #37453.
Built from https://develop.svn.wordpress.org/trunk@47094


git-svn-id: http://core.svn.wordpress.org/trunk@46894 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-01-21 02:21:05 +00:00
Sergey Biryukov 60c651ad6a I18N: Add missing placeholders to some translators comments in `wp-admin`. 
Props ramiy.
Fixes #49248.
Built from https://develop.svn.wordpress.org/trunk@47093


git-svn-id: http://core.svn.wordpress.org/trunk@46893 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-01-20 15:43:04 +00:00
Sergey Biryukov c946a71d9d I18N: Correct translator comment in `wp-admin/options-permalink.php`. 
Props ramiy.
Fixes #49247.
Built from https://develop.svn.wordpress.org/trunk@47092


git-svn-id: http://core.svn.wordpress.org/trunk@46892 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-01-20 15:10:04 +00:00
Sergey Biryukov cf249b07ed I18N: Merge duplicate `%1$s is not of type %2$s` strings in `rest_validate_value_from_schema()`. 
Props ramiy.
Fixes #49244.
Built from https://develop.svn.wordpress.org/trunk@47091


git-svn-id: http://core.svn.wordpress.org/trunk@46891 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-01-20 14:44:06 +00:00
Sergey Biryukov 1adca958e3 I18N: Remove unnecessary HTML from "Active:" strings in `wp-admin/themes.php`. 
Follow-up to [45435].

Props ramiy.
Fixes #49243.
Built from https://develop.svn.wordpress.org/trunk@47090


git-svn-id: http://core.svn.wordpress.org/trunk@46890 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-01-20 14:27:04 +00:00
Sergey Biryukov d5be8f0635 I18N: Correct translator comments in `WP_Users_List_Table::get_views()` to provide information about each placeholder. 
Props ramiy.
Fixes #49242.
Built from https://develop.svn.wordpress.org/trunk@47089


git-svn-id: http://core.svn.wordpress.org/trunk@46889 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2020-01-20 14:08:05 +00:00
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