Sergey Biryukov
e19329bad0
Docs: Add requires_php
to the list of fields returned by plugins_api()
.
...
Props ediamin.
Fixes #48291 .
Built from https://develop.svn.wordpress.org/trunk@46463
git-svn-id: http://core.svn.wordpress.org/trunk@46261 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-10-12 02:35:04 +00:00
Mike Schroder
66c8085fc4
Media: Update fallback previews to support _wp_make_subsizes()
...
Allows fallback previews (PDF by default, in core) to save image meta
after each size is generated to allow for resuming, and make sizes
immediately available.
Props azaozz, antpb, progremzion, mikeschroder.
See #48111 .
Built from https://develop.svn.wordpress.org/trunk@46459
git-svn-id: http://core.svn.wordpress.org/trunk@46257 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-10-11 07:54:03 +00:00
desrosj
c6d3987b08
Upgrade/Install: Detect the presence of the native PHP JSON extension before updating.
...
The PHP native JSON extension has been bundled and compiled with PHP by default since version 5.2.0. Because the minimum version of PHP required by WordPress is now 5.6.20 (see #46594 and [45058]), the related polyfills and workarounds have been removed (see [46205-46206,46208]).
However, even though the JSON extension is now included in PHP by default, it is still possible to disable the extension in a custom configuration. This change will prevent sites from upgrading if the JSON extension is disabled to prevent compatibility issues.
Props jrf, jorbin, dd32, desrosj.
Fixes #47699 .
Built from https://develop.svn.wordpress.org/trunk@46455
git-svn-id: http://core.svn.wordpress.org/trunk@46253 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-10-09 22:22:04 +00:00
Sergey Biryukov
8d1e51e9c7
Docs: Add a @since
note about new parameters with the spread operator added to function signatures.
...
Props jrf.
See #47678 .
Built from https://develop.svn.wordpress.org/trunk@46451
git-svn-id: http://core.svn.wordpress.org/trunk@46249 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-10-09 04:28:02 +00:00
johnjamesjacoby
477f0ffd71
Network Admin: Improve Site States in List Table rows.
...
This commit switches a comparison to a Yoda condition, performs a more strict `intval()` check on the value of the Site Status column, and prevents a specific Site State from appearing in List Table rows when filtering by that same Site State already (to match the behavior of other List Table State implementations.)
Fixes #37684 . Props pbiron.
Built from https://develop.svn.wordpress.org/trunk@46441
git-svn-id: http://core.svn.wordpress.org/trunk@46239 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-10-08 17:46:02 +00:00
Sergey Biryukov
760a55b310
Docs: Add missing @deprecated
tags in the file docblock of some deprecated files.
...
Props jrf.
Fixes #48254 .
Built from https://develop.svn.wordpress.org/trunk@46439
git-svn-id: http://core.svn.wordpress.org/trunk@46237 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-10-08 17:19:04 +00:00
Andrew Ozz
f793398e4f
Upload: Set custom header with the attachment ID for all uploads from media_handle_upload()
. Let the REST API endpoint set it separately.
...
Props timothyblynjacobs.
Fixes #48200 .
Built from https://develop.svn.wordpress.org/trunk@46421
git-svn-id: http://core.svn.wordpress.org/trunk@46219 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-10-07 15:30:02 +00:00
Andrea Fercia
1f3d583825
Accessibility: Media: Improve the search media field labelling.
...
Visible `<label>` elements benefit all users. The `placeholder` attribute should not be used as a replacement for visible labels.
Instead, it's supposed to be used only for a short hint to aid users with data entry e.g. a sample value or a brief description of the expected format.
Screen readers may not announce a `placeholder` attribute at all. Other users may suffer from the lack of a visible label and a placeholder used as replacement, for example:
- users with cognitive disabilities may have trouble remembering what the filled field does
- speech recognition users cannot see the name they can speak to set focus on the field
- low-vision users with high text-size may not be able to see the whole placeholder even when it's visible, if its value is clipped by the edge of the input
Props anevins, audrasjb, karmatosed, azaozz, SergeyBiryukov, afercia.
See #40331 .
Fixes #47138 .
Built from https://develop.svn.wordpress.org/trunk@46418
git-svn-id: http://core.svn.wordpress.org/trunk@46216 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-10-07 12:43:03 +00:00
Sergey Biryukov
554b60da76
Docs: Format comments in wp-admin/includes/plugin.php
as per the documentation standards.
...
Props dkarfa.
Fixes #48191 .
Built from https://develop.svn.wordpress.org/trunk@46410
git-svn-id: http://core.svn.wordpress.org/trunk@46208 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-10-06 02:23:03 +00:00
Sergey Biryukov
f1b5f2aa94
Site Health: Improve the wording for UTF8MB4
test description.
...
Props garrett-eclipse, chetan200891, johnjamesjacoby, ayeshrajans.
Fixes #48044 .
Built from https://develop.svn.wordpress.org/trunk@46402
git-svn-id: http://core.svn.wordpress.org/trunk@46201 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-10-05 02:39:58 +00:00
Sergey Biryukov
f19ecd19de
Filesystem API: Use strict type check in the in_array()
call for the $skip_list
parameter in copy_dir()
and _copy_dir()
.
...
This ensures that parent folders with a numeric name are not accidentally skipped when only a subfolder is intended to be skipped.
Props codex-m.
Fixes #46581 .
Built from https://develop.svn.wordpress.org/trunk@46400
git-svn-id: http://core.svn.wordpress.org/trunk@46199 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-10-05 02:16:56 +00:00
Sergey Biryukov
30913bc9a2
Docs: Correct formatting of the @return
value description in _wp_handle_upload()
.
...
See #47110 .
Built from https://develop.svn.wordpress.org/trunk@46399
git-svn-id: http://core.svn.wordpress.org/trunk@46198 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-10-05 02:09:57 +00:00
Sergey Biryukov
60617d471b
Docs: Add missing documentation for the first parameter of the big_image_size_threshold
filter.
...
Props dkarfa, desrosj, earnjam.
Fixes #48214 .
Built from https://develop.svn.wordpress.org/trunk@46398
git-svn-id: http://core.svn.wordpress.org/trunk@46197 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-10-05 01:30:58 +00:00
Sergey Biryukov
d2a48496d2
Docs: Add missing description for $comment
global.
...
Props immeet94, mukesh27.
Fixes #46928 . See #47110 .
Built from https://develop.svn.wordpress.org/trunk@46391
git-svn-id: http://core.svn.wordpress.org/trunk@46190 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-10-04 22:19:57 +00:00
Sergey Biryukov
f34db2aa7e
I18N: Add missing comma in a translator comment.
...
See #47515 .
Built from https://develop.svn.wordpress.org/trunk@46390
git-svn-id: http://core.svn.wordpress.org/trunk@46189 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-10-04 22:09:57 +00:00
Dominik Schilling
d38d1c2c35
I18N: Fix translator comment for a themes list table string with numbered placeholders.
...
Props garrett-eclipse.
Fixes #47515 .
Built from https://develop.svn.wordpress.org/trunk@46387
git-svn-id: http://core.svn.wordpress.org/trunk@46186 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-10-04 20:20:58 +00:00
Dominik Schilling
cd6110782e
Networks and Sites: Improve newly added strings for i18n.
...
* Remove unnecessary numbered placeholders.
* Add context to "All" and "Spam" status.
* Add translator comments.
Props pedromendonca.
Fixes #48210 .
Built from https://develop.svn.wordpress.org/trunk@46385
git-svn-id: http://core.svn.wordpress.org/trunk@46184 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-10-04 19:58:55 +00:00
Andrew Ozz
ff225c8bfc
Upload: Fix the method used to create image sub-sizes when uploading fails with a PHP fatal error. Use a custom header to send the new attachment post ID even in HTTP 500 responses instead of an upload reference sent by the client. Also add another cap check and remove the action when deleting an attachment post during a failed upload cleanup.
...
Props timothyblynjacobs, clorith, azaozz.
Fixes #48200 .
Built from https://develop.svn.wordpress.org/trunk@46382
git-svn-id: http://core.svn.wordpress.org/trunk@46181 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-10-03 21:02:00 +00:00
desrosj
efa9da7446
Docs: Fix code example for removing internal pointers.
...
Props daleharrison, swissspidy, garrett-eclipse, luciano-croce, jrf, desrosj.
Fixes #45529 .
Built from https://develop.svn.wordpress.org/trunk@46381
git-svn-id: http://core.svn.wordpress.org/trunk@46180 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-10-03 20:39:58 +00:00
desrosj
6a0f3ddae3
Menus: Fix typo in the class attribute for the hidden title
field in Walker_Nav_Menu_Checklist
.
...
Each item that `Walker_Nav_Menu_Checklist` displays is accompanied by several hidden `<input/>` fields that specify default values for each item when added to a menu. These values are passed in JavaScript to the AJAX call triggered when an item is added to a menu.
The hidden field for the title attribute field incorrectly had an underscore instead of a hyphen. Because of this, it was impossible to supply a default value for the Title Attribute field of a nav menu item.
Props yanngarcia, davidbaumwald.
See #47838 .
Built from https://develop.svn.wordpress.org/trunk@46380
git-svn-id: http://core.svn.wordpress.org/trunk@46179 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-10-03 20:03:56 +00:00
Sergey Biryukov
3e40f12574
Privacy: Remove unused $wpdb
global in WP_Privacy_Requests_Table::prepare_items()
.
...
Props david.binda.
Fixes #48178 .
Built from https://develop.svn.wordpress.org/trunk@46374
git-svn-id: http://core.svn.wordpress.org/trunk@46173 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-10-02 23:22:58 +00:00
Sergey Biryukov
44c3cefb24
Docs: Fix typo in wp_get_missing_image_subsizes()
DocBlock.
...
Props david.binda.
Fixes #48179 .
Built from https://develop.svn.wordpress.org/trunk@46368
git-svn-id: http://core.svn.wordpress.org/trunk@46167 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-10-01 01:19:57 +00:00
antpb
6531c237e7
Media: Prevents clipping of text when scaling image edit screen.
...
This reapplies [46354] clean as the previous commit had remnants of an unrelated patch.
Props sabernhardt, audrasjb, afercia.
See #47115 .
Built from https://develop.svn.wordpress.org/trunk@46359
git-svn-id: http://core.svn.wordpress.org/trunk@46158 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-09-30 17:56:57 +00:00
desrosj
ae29987a17
Site Health: Improve the message displayed to sites not utilizing HTTPS.
...
The new message better illustrates that there are many potential benefits of using HTTPS, not just a few.
Props garrett-eclipse, dkarfa, ocean90, afragen, desrosj.
Fixes #48118 .
Built from https://develop.svn.wordpress.org/trunk@46358
git-svn-id: http://core.svn.wordpress.org/trunk@46157 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-09-30 17:54:58 +00:00
antpb
247e7eb7d5
Media: Revert [46354] preventing bad clipping of text in image details page.
...
See #47115 .
Built from https://develop.svn.wordpress.org/trunk@46355
git-svn-id: http://core.svn.wordpress.org/trunk@46154 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-09-30 17:12:59 +00:00
antpb
7c8028febf
Media: Prevents clipping of text when scaling image edit screen.
...
Props sabernhardt, audrasjb, afercia.
See #47115 .
Built from https://develop.svn.wordpress.org/trunk@46354
git-svn-id: http://core.svn.wordpress.org/trunk@46153 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-09-30 16:34:58 +00:00
Andrew Ozz
38e6958698
Media: Move wp_get_original_image_path()
to wp-content/post.php
to make it easier to access from plugins.
...
Props pbiron.
See #47873 .
Built from https://develop.svn.wordpress.org/trunk@46353
git-svn-id: http://core.svn.wordpress.org/trunk@46152 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-09-30 16:28:59 +00:00
Sergey Biryukov
5f2c7142a1
Docs: Improve documentation for ::display()
methods in various list tables.
...
Props itowhid06.
Fixes #47947 .
Built from https://develop.svn.wordpress.org/trunk@46341
git-svn-id: http://core.svn.wordpress.org/trunk@46140 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-09-29 11:04:58 +00:00
Sergey Biryukov
07a753cb35
Docs: Add documentation for WP_Comments_List_Table::display()
.
...
Props itowhid06, dinhtungdu.
Fixes #47929 .
Built from https://develop.svn.wordpress.org/trunk@46336
git-svn-id: http://core.svn.wordpress.org/trunk@46135 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-09-27 23:03:58 +00:00
whyisjake
c034f5b4c3
Menus: Replace http with https in placeholders.
...
Encourage the use of https with the placeholder text in menus.
Fixes #46312
Props aksl95, audrasjb, celloexpressions, SergeyBiryukov, jorbin.
Built from https://develop.svn.wordpress.org/trunk@46330
git-svn-id: http://core.svn.wordpress.org/trunk@46129 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-09-26 20:32:55 +00:00
Andrea Fercia
93dd6d907a
Accessibility: Media: Make the Image Editor buttons text visible.
...
User interface controls that use only icons aren't ideal for many users.
Universal icons are rare. Icons must communicate meaning but their actual meaning varies depending on many factors including the users cultural background.
Moreover, users with cognitive impairments and speech recognition users need interface controls with visible text to be able to operate them.
- shortens some of the buttons text to: Rotate left, Rotate right, Flip vertical, Flip horizontal
- moves the Undo and Redo buttons underneath the main buttons group
Props nrqsnchz, melchoyce, karmatosed, sabernhardt, mikeschroder.
Fixes #47116 .
Built from https://develop.svn.wordpress.org/trunk@46326
git-svn-id: http://core.svn.wordpress.org/trunk@46125 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-09-26 17:16:57 +00:00
Sergey Biryukov
6e8f550770
General: Correct strict comparison in WP_Links_List_Table::column_categories()
introduced in [46313].
...
`$cat_id` is a string, `$category` is an integer.
See #48142 .
Built from https://develop.svn.wordpress.org/trunk@46316
git-svn-id: http://core.svn.wordpress.org/trunk@46115 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-09-26 01:24:56 +00:00
Sergey Biryukov
148322a970
Docs: Improve documentation for _post_states()
and get_post_states()
.
...
Add documentation for `_media_states()`.
See #47110 .
Built from https://develop.svn.wordpress.org/trunk@46315
git-svn-id: http://core.svn.wordpress.org/trunk@46114 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-09-26 00:57:58 +00:00
whyisjake
a351243928
General: Further phpcs cleanup.
...
In [46312] and [46313] we attempted to do some phpcs cleanup. This commit cleans up three issues that were introduced in [46309].
Fixes #48142 .
Props: whyisjake, garrett-eclipse, desrosj
Built from https://develop.svn.wordpress.org/trunk@46314
git-svn-id: http://core.svn.wordpress.org/trunk@46113 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-09-26 00:37:58 +00:00
whyisjake
d53b773a47
General: Further phpcs cleanup.
...
In [46312] we attempted to do some `phpcs` cleanup. This commit cleans up three issues that were introduced in [46309].
Fixes #48142 .
Props whyisjake, garrett-eclipse.
Built from https://develop.svn.wordpress.org/trunk@46313
git-svn-id: http://core.svn.wordpress.org/trunk@46112 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-09-25 23:38:57 +00:00
whyisjake
38dc032e66
General: Linter cleanup
...
`phpcbf` was able to clean up a few files. Tests were breaking as a result of code formatting.
Fixes #48142
Props whyisjake
Built from https://develop.svn.wordpress.org/trunk@46312
git-svn-id: http://core.svn.wordpress.org/trunk@46111 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-09-25 22:53:58 +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
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
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
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
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
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
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
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
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
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