Sergey Biryukov
860fc16954
Tests: Speed up comment submission unit tests by creating less fixtures and reusing them where possible.
...
See #30017 , #48145 .
Built from https://develop.svn.wordpress.org/trunk@46829
git-svn-id: http://core.svn.wordpress.org/trunk@46629 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-12-08 18:02:07 +00:00
Sergey Biryukov
f11d28a779
Twenty Twenty: Use duplicate hook references for page_css_class
and page_menu_link_attributes
filters in TwentyTwenty_Walker_Page
.
...
See #48303 .
Built from https://develop.svn.wordpress.org/trunk@46828
git-svn-id: http://core.svn.wordpress.org/trunk@46628 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-12-07 14:03:03 +00:00
Sergey Biryukov
6677070a13
Bundled Themes: Correct @since
tags to refer to the theme version instead of WordPress version.
...
This makes `@since` notations in Twenty Seventeen, Twenty Nineteen, and Twenty Twenty consistent with the previous bundled themes.
See #48303 .
Built from https://develop.svn.wordpress.org/trunk@46827
git-svn-id: http://core.svn.wordpress.org/trunk@46627 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-12-07 13:56:06 +00:00
John Blackbourn
d53103ed62
Docs: Further docblock corrections and improvements.
...
See #48303
Built from https://develop.svn.wordpress.org/trunk@46826
git-svn-id: http://core.svn.wordpress.org/trunk@46626 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-12-07 13:23:01 +00:00
Sergey Biryukov
0f971e68ec
Twenty Twenty: Replace Smooth Scroll JS implementation with scroll-behavior
CSS property.
...
The JS implementation had multiple issues and did not work as expected.
This change includes an accessibility enhancement by using `prefers-reduced-motion: reduce` media query property for users that don't want motion effects. For further explanation on this media query, see MDN documentation: https://developer.mozilla.org/en-US/docs/Web/CSS/scroll-behavior#Accessibility_concerns
Props audrasjb, melchoyce, joostdevalk, Anlino, mauteri, sergiomdgomes, littlebigthing, williampatton, netweb, andraganescu, joyously, acosmin, mukesh27, hareesh-pillai.
Fixes #48763 , #48551 , #48866 .
Built from https://develop.svn.wordpress.org/trunk@46824
git-svn-id: http://core.svn.wordpress.org/trunk@46624 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-12-07 11:05:01 +00:00
John Blackbourn
f93ee2ca76
Docs: Increase the specificity of various docblock parameter types and return types.
...
See #48303
Built from https://develop.svn.wordpress.org/trunk@46823
git-svn-id: http://core.svn.wordpress.org/trunk@46623 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-12-06 22:43:04 +00:00
Andrew Ozz
15a566edef
Upload: fix wp_unique_filename()
to prevent name collisions with existing or future image sub-size file names, and add unit tests.
...
Props Viper007Bond, pbiron, azaozz.
Fixes #42437 .
Built from https://develop.svn.wordpress.org/trunk@46822
git-svn-id: http://core.svn.wordpress.org/trunk@46622 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-12-06 22:28:00 +00:00
John Blackbourn
aa1fdcbd52
Docs: Correct various docblocks documentation.
...
See #48303
Built from https://develop.svn.wordpress.org/trunk@46821
git-svn-id: http://core.svn.wordpress.org/trunk@46621 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-12-06 22:23:04 +00:00
Aaron Jorbin
7d84502589
Text Changes: Rename Comment Blacklist option to be more inclusive
...
This doesn't change the underlying option name as that would be a backcompat break, but it makes the UI a bit more inclusive.
Props dartiss, jeremyfelt, aaronjorbin.
Fixes #48900 .
Built from https://develop.svn.wordpress.org/trunk@46820
git-svn-id: http://core.svn.wordpress.org/trunk@46620 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-12-06 18:12:02 +00:00
Sergey Biryukov
c375d23ef5
Tests: Remove duplicate test_get_page_by_path_priority()
test.
...
The test was moved into its own file in [37478], but never removed from its previous location.
See #36711 .
Built from https://develop.svn.wordpress.org/trunk@46819
git-svn-id: http://core.svn.wordpress.org/trunk@46619 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-12-06 17:27:05 +00:00
Sergey Biryukov
2165eef44c
Accessibility: Administration: Correct active button color for the alternative color schemes.
...
Follow-up to [46815].
Props melchoyce, ryelle, larrach, audrasjb, studiotwee, afercia, azaozz.
Fixes #48598 .
Built from https://develop.svn.wordpress.org/trunk@46817
git-svn-id: http://core.svn.wordpress.org/trunk@46617 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-12-05 22:12:03 +00:00
Sergey Biryukov
20e18613d0
Accessibility: Administration: Apply a unified design to all secondary buttons across all color schemes.
...
This ensures that secondary buttons have an appropriate color contrast in the alternative color schemes.
Props melchoyce, ryelle, audrasjb, ate-up-with-motor, afercia, sabernhardt.
Fixes #48585 .
Built from https://develop.svn.wordpress.org/trunk@46815
git-svn-id: http://core.svn.wordpress.org/trunk@46615 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-12-05 21:32:03 +00:00
Sergey Biryukov
23abf27b1a
XML-RPC: Unify some "could not be created/updated/deleted" error messages for consistency.
...
Props ramiy, SergeyBiryukov.
Fixes #48883 .
Built from https://develop.svn.wordpress.org/trunk@46814
git-svn-id: http://core.svn.wordpress.org/trunk@46614 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-12-05 13:48:03 +00:00
ianbelanger
8d6912dd27
Bundled Themes: Adds Customizer option to show or hide author bio Twenty Twenty.
...
This adds an option to the Customizer that allows you to turn the author bio on or off, sitewide.
Props williampatton, nielslange acosmin, dlh.
Fixes #48550 .
Built from https://develop.svn.wordpress.org/trunk@46813
git-svn-id: http://core.svn.wordpress.org/trunk@46613 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-12-04 15:59:03 +00:00
Sergey Biryukov
38ad319fdf
I18N: Change context for the "Add New" string on Themes screen for consistency with other similar strings.
...
Props ramiy.
Fixes #48875 .
Built from https://develop.svn.wordpress.org/trunk@46812
git-svn-id: http://core.svn.wordpress.org/trunk@46612 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-12-04 10:36:01 +00:00
Sergey Biryukov
a5e52e04ee
Docs: Move the canonical DocBlock for handle_bulk_actions-{$screen}
action to wp-admin/edit.php
.
...
* Document accepted values for the `$items` parameter.
* Use interpolated syntax for the filter name.
Props dilipbheda, johnbillion, SergeyBiryukov.
Fixes #48857 .
Built from https://develop.svn.wordpress.org/trunk@46811
git-svn-id: http://core.svn.wordpress.org/trunk@46611 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-12-03 13:58:05 +00:00
Sergey Biryukov
6d1ed93c91
Taxonomy: Remove redundant caching from get_all_category_ids()
, deprecated in favor of get_terms()
in [28679].
...
The `all_category_ids` cache key it relied on was removed in [5555] and never repopulated, causing invalid or unexpected results when using a persistent object cache.
Props itowhid06, johnjamesjacoby.
Fixes #48176 .
Built from https://develop.svn.wordpress.org/trunk@46810
git-svn-id: http://core.svn.wordpress.org/trunk@46610 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-12-02 14:49:01 +00:00
Andrew Ozz
135e608b46
Upload: Exclude PNG images from scaling after uploading. Fixes a case where resizing a very large PNG may create a scaled image that has smaller dimensions but larger file size than the original.
...
Fixes #48736 .
Built from https://develop.svn.wordpress.org/trunk@46809
git-svn-id: http://core.svn.wordpress.org/trunk@46609 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-12-01 18:26:05 +00:00
Sergey Biryukov
221287f626
Widgets: Remove WP_Widget_Factory::$hashed_class_counts
property, unused since [46220].
...
The `spl_object_hash()` function was introduced in PHP 5.2.0. As of PHP 5.3, the PHP SPL extension can no longer be disabled, so the `WP_Widget_Factory::hash_object()` workaround was removed in [46220].
See #48074 .
Built from https://develop.svn.wordpress.org/trunk@46808
git-svn-id: http://core.svn.wordpress.org/trunk@46608 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-12-01 12:13:01 +00:00
Sergey Biryukov
0221a593b9
Administration: Correct font size for comment count in "At a Glance" dashboard widget on mobile.
...
Props donmhico, jeremyfelt.
Fixes #48799 .
Built from https://develop.svn.wordpress.org/trunk@46807
git-svn-id: http://core.svn.wordpress.org/trunk@46607 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-11-30 00:42:01 +00:00
Sergey Biryukov
585af17b7c
Tests: Merge [24251] from _wp_filter_build_unique_id()
to _test_filter_build_unique_id()
, for consistency.
...
See #47407 .
Built from https://develop.svn.wordpress.org/trunk@46806
git-svn-id: http://core.svn.wordpress.org/trunk@46606 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-11-29 22:17:01 +00:00
Sergey Biryukov
3047531f6a
Plugins: In _wp_filter_build_unique_id()
, remove $wp_filter
global and $filter_id_count
static variable, unused since [46220].
...
See #47407 , #48074 .
Built from https://develop.svn.wordpress.org/trunk@46805
git-svn-id: http://core.svn.wordpress.org/trunk@46605 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-11-29 22:14:01 +00:00
Sergey Biryukov
1d1c74385f
REST API: Use strict in_array()
checks for the list of usernames blacklisted via illegal_user_logins
filter.
...
See #48839 .
Built from https://develop.svn.wordpress.org/trunk@46804
git-svn-id: http://core.svn.wordpress.org/trunk@46604 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-11-29 22:04:02 +00:00
Sergey Biryukov
86c441140b
REST API: Use a strict in_array()
check in WP_REST_Request::get_parameter_order()
.
...
See #48839 .
Built from https://develop.svn.wordpress.org/trunk@46803
git-svn-id: http://core.svn.wordpress.org/trunk@46603 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-11-29 22:01:03 +00:00
Sergey Biryukov
d33571f7d5
REST API: Use a strict in_array()
check in WP_REST_Meta_Fields::get_registered_fields()
.
...
Props dkarfa.
Fixes #48839 .
Built from https://develop.svn.wordpress.org/trunk@46802
git-svn-id: http://core.svn.wordpress.org/trunk@46602 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-11-29 21:59:03 +00:00
Sergey Biryukov
49401759f3
Docs: Correct @param
type for the function parameter in tests_add_filter()
and _test_filter_build_unique_id()
.
...
Synchronize documentation for `add_filter()`, `tests_add_filter()`, `_wp_filter_build_unique_id()`, `_test_filter_build_unique_id()`.
Add a note that `$tag` and `$priority` are no longer used in `_wp_filter_build_unique_id()` since [46220], and the function always returns a string now.
Props donmhico, remcotolsma, SergeyBiryukov.
Fixes #47407 . See #48303 .
Built from https://develop.svn.wordpress.org/trunk@46801
git-svn-id: http://core.svn.wordpress.org/trunk@46601 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-11-29 21:42:01 +00:00
Sergey Biryukov
2a0489ec49
Docs: Replace @returns
tags in JS docs with @return
.
...
Per the documentation standards, `@returns` is an unsupported synonym, `@return` should be used instead:
https://make.wordpress.org/core/handbook/best-practices/inline-documentation-standards/javascript/
See #48303 .
Built from https://develop.svn.wordpress.org/trunk@46800
git-svn-id: http://core.svn.wordpress.org/trunk@46600 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-11-29 18:01:03 +00:00
Sergey Biryukov
4a4afbd68c
Docs: Add missing full stops to @returns
tags in JS docs, per the documentation standards.
...
Props shital-patel, kalpshit.
Fixes #48305 .
Built from https://develop.svn.wordpress.org/trunk@46799
git-svn-id: http://core.svn.wordpress.org/trunk@46599 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-11-29 16:56:02 +00:00
Sergey Biryukov
acd0a3ca99
Site Health: Add a test for PHP default timezone.
...
The test reports a failure if the default timezone was changed with `date_default_timezone_set()` to anything other than `UTC`.
WordPress historically uses `UTC` as the default timezone for calculating date and time offsets, overriding it is not recommended and can cause widespread and obscure issues.
Props Rarst, Clorith, TimothyBlynJacobs.
Fixes #48692 .
Built from https://develop.svn.wordpress.org/trunk@46797
git-svn-id: http://core.svn.wordpress.org/trunk@46597 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-11-28 15:48:03 +00:00
Sergey Biryukov
9d14355bf5
Date/Time: Make get_permalink()
more resilient against PHP timezone changes.
...
Overriding default PHP timezone with `date_default_timezone_set()`, while not recommended, should not inadvertently result in changing existing permalinks.
Add a unit test.
Props Rarst, steevithak, archon810, maciejmackowiak, Ov3rfly, Cybr, hometowntrailers, scvleon, miette49.
Fixes #48623 .
Built from https://develop.svn.wordpress.org/trunk@46795
git-svn-id: http://core.svn.wordpress.org/trunk@46595 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-11-28 13:42:00 +00:00
Sergey Biryukov
7acfab22b8
KSES: Add support for gradient backgrounds.
...
Props jorgefilipecosta.
Fixes #48376 .
Built from https://develop.svn.wordpress.org/trunk@46793
git-svn-id: http://core.svn.wordpress.org/trunk@46593 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-11-28 00:29:02 +00:00
Sergey Biryukov
0aef4faacd
Plugins: Correct default value of $replacement
parameter in do_action_deprecated()
and apply_filters_deprecated()
.
...
This addresses an inconsistency with `_deprecated_hook()`, which uses `is_null()` to check if `$replacement` was provided, however the previous default value was `false`.
Props shaampk1, felipeelia.
Fixes #48817 .
Built from https://develop.svn.wordpress.org/trunk@46792
git-svn-id: http://core.svn.wordpress.org/trunk@46592 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-11-27 23:55:01 +00:00
Sergey Biryukov
6f86cedb09
Menus: Improve the wording of instructions for dragging the items into the preferred order.
...
Props amolv, equin0x80, dlh.
Fixes #48184 .
Built from https://develop.svn.wordpress.org/trunk@46791
git-svn-id: http://core.svn.wordpress.org/trunk@46591 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-11-27 19:51:01 +00:00
Sergey Biryukov
d8b251f0af
Administration: Properly wrap long titles in list tables on smaller screens.
...
Props mukesh27, iihglobal, wpamitkumar.
Fixes #48805 .
Built from https://develop.svn.wordpress.org/trunk@46790
git-svn-id: http://core.svn.wordpress.org/trunk@46590 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-11-27 16:52:02 +00:00
Sergey Biryukov
e2c2fb64bf
Users: Display admin email verification screen in user's locale instead of site locale.
...
Props sathyapulse, TimothyBlynJacobs.
Fixes #48313 .
Built from https://develop.svn.wordpress.org/trunk@46788
git-svn-id: http://core.svn.wordpress.org/trunk@46588 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-11-27 14:35:02 +00:00
ianbelanger
c74c8cf5f1
Bundled Themes: Fixes JS TypeError in Twenty Twenty.
...
On mobile devices using a webkit browser, the menu and search modals could not be opened due to a `TypeError: document.body is null`. This commit fixes that issue by adding a `touch-enabled` class to the body for browsers that do not support media queries.
Props quicoto, poena, Boga86, acosmin, macmanx.
Fixes #48601 .
Built from https://develop.svn.wordpress.org/trunk@46786
git-svn-id: http://core.svn.wordpress.org/trunk@46586 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-11-26 18:21:03 +00:00
Sergey Biryukov
5af0c2989b
Tests: Add feed
group for get_feed_build_date()
test added in [46756].
...
See #48675 .
Built from https://develop.svn.wordpress.org/trunk@46785
git-svn-id: http://core.svn.wordpress.org/trunk@46585 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-11-26 16:19:03 +00:00
Dominik Schilling
f4165a697d
Upgrade/Install: Provide a default label for "Continue" button in language selection form.
...
Prevents an empty continue button if a translation isn't yet available.
Props sathyapulse.
Fixes #48776 .
Built from https://develop.svn.wordpress.org/trunk@46784
git-svn-id: http://core.svn.wordpress.org/trunk@46584 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-11-26 15:19:04 +00:00
Sergey Biryukov
63fefb540a
Users: Use correct variable when displaying the Additional Capabilities list in user profile.
...
Addresses a regression in [45926].
Props wpgurudev, aravindajith, anantajitjg, davidbaumwald.
Fixes #48725 .
Built from https://develop.svn.wordpress.org/trunk@46782
git-svn-id: http://core.svn.wordpress.org/trunk@46582 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-11-25 14:01:03 +00:00
Sergey Biryukov
e0830ac7bc
Options, Meta APIs: Update @since
version for the $force_cache
parameter added for wp_load_alloptions()
in [46753] to 5.3.1.
...
See #31245 .
Built from https://develop.svn.wordpress.org/trunk@46779
git-svn-id: http://core.svn.wordpress.org/trunk@46579 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-11-25 13:44:02 +00:00
Sergey Biryukov
012ddf095a
Media: Avoid a PHP notice in image_downsize()
when trying to replace a non-image URL with a rendered image from its meta.
...
Props Mte90, jrf, hareesh-pillai.
Fixes #48324 .
Built from https://develop.svn.wordpress.org/trunk@46772
git-svn-id: http://core.svn.wordpress.org/trunk@46572 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-11-25 10:07:02 +00:00
Sergey Biryukov
2a85fe21d8
Accessibility: Administration: Underline links on Dashboard that are located within a line of text and thus need to be underlined:
...
* "change your theme completely"
* Active theme in the "At a Glance" box
* "View all drafts" in the Quick Draft box
Split "Manage widgets or menus" into separate items for consistency with other links.
For better accessibility, links that are a part of other text should be underlined and not rely on color alone to be distinguished.
Per accessibility coding standards:
> When links can be identified as such by the context, for example because they’re part of a menu, or a set of links clearly identified as user interface controls, they don’t necessarily need to be underlined. In all the other cases, especially for links surrounded by other text (in a line or block of text), links need to be always underlined.
https://make.wordpress.org/core/handbook/best-practices/coding-standards/accessibility-coding-standards/#links-underline-or-no-underline
https://make.wordpress.org/accessibility/handbook/design/use-of-color/#not-by-color-alone
Props afercia, audrasjb, karmatosed.
Fixes #48406 .
Built from https://develop.svn.wordpress.org/trunk@46770
git-svn-id: http://core.svn.wordpress.org/trunk@46570 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-11-24 19:57:05 +00:00
Sergey Biryukov
a1ad168857
Twenty Twenty: Remove duplicate array key/value in TwentyTwenty_Non_Latin_Languages::get_non_latin_css()
.
...
Props manikmist09.
Fixes #48624 .
Built from https://develop.svn.wordpress.org/trunk@46765
git-svn-id: http://core.svn.wordpress.org/trunk@46565 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-11-24 10:55:02 +00:00
Sergey Biryukov
c786eaa1df
Coding Standards: Fix WPCS issue in [46763].
...
See #48777 .
Built from https://develop.svn.wordpress.org/trunk@46764
git-svn-id: http://core.svn.wordpress.org/trunk@46564 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-11-23 19:21:03 +00:00
Sergey Biryukov
26a750e162
Docs: Add missing @since
tags for functions in wp-admin/includes/update.php
.
...
Props sathyapulse, zodiac1978.
Fixes #48777 .
Built from https://develop.svn.wordpress.org/trunk@46763
git-svn-id: http://core.svn.wordpress.org/trunk@46563 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-11-23 18:51:01 +00:00
Sergey Biryukov
0b5f3acd9f
Twenty Twenty: Correctly align the author bio and bottom post meta on single posts on mobile.
...
Props nielslange, Anlino.
Fixes #48619 .
Built from https://develop.svn.wordpress.org/trunk@46762
git-svn-id: http://core.svn.wordpress.org/trunk@46562 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-11-23 14:54:04 +00:00
Sergey Biryukov
8e9c4a116a
Embeds: Remove CollegeHumor oEmbed provider, as the service does not exist anymore.
...
Props audrasjb, youknowriad.
Fixes #48696 .
Built from https://develop.svn.wordpress.org/trunk@46761
git-svn-id: http://core.svn.wordpress.org/trunk@46561 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-11-23 10:15:03 +00:00
Sergey Biryukov
58aa1cc8c5
Docs: Adjust wp_is_json_request()
and wp_is_xml_request()
return value descriptions for consistency.
...
See #48771 , #48303 .
Built from https://develop.svn.wordpress.org/trunk@46760
git-svn-id: http://core.svn.wordpress.org/trunk@46560 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-11-22 18:28:04 +00:00
Sergey Biryukov
597b22c99c
Docs: Correct spelling and capitalization in wp-includes/load.php
:
...
* Fix typo in `is_blog_admin()` description.
* Capitalize PHP correctly in `enable_wp_debug_mode_checks` filter description.
* Capitalize XML correctly in `wp_is_xml_request()` return value description.
Props stevegrunwell.
Fixes #48771 .
Built from https://develop.svn.wordpress.org/trunk@46759
git-svn-id: http://core.svn.wordpress.org/trunk@46559 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-11-22 18:16:03 +00:00
Sergey Biryukov
56af5db74f
Editor: Improve the appearance of tag cloud in Tags meta box in classic editor.
...
Props sathyapulse, Spaceshipone, tmatsuur, audrasjb, afercia.
Fixes #48592 .
Built from https://develop.svn.wordpress.org/trunk@46758
git-svn-id: http://core.svn.wordpress.org/trunk@46558 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-11-22 00:04:02 +00:00