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

39936 Commits

Author SHA1 Message Date
Sergey Biryukov 7cadbb50bf Docs: Fix incorrect `@see` notation in `wp_localize_script()` DocBlock. 
Props coffee2code, shamim51.
Fixes #47104.
Built from https://develop.svn.wordpress.org/trunk@45392


git-svn-id: http://core.svn.wordpress.org/trunk@45203 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2019-05-24 01:02:51 +00:00
Sergey Biryukov 726e77d97e Networks and Sites: Readjust tabs in `wp-admin/includes/network.php` for (more or less) consistent alignment. 
See #47062.
Built from https://develop.svn.wordpress.org/trunk@45391


git-svn-id: http://core.svn.wordpress.org/trunk@45202 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2019-05-23 23:35:52 +00:00
Sergey Biryukov 139225ad7a Networks and Sites: Remove extra whitespace in `.htaccess` rules on Network Setup page. 
Props riddhiehta02 for initial patch, sebastienserre, masterforwordpress.
Fixes #47062.
Built from https://develop.svn.wordpress.org/trunk@45390


git-svn-id: http://core.svn.wordpress.org/trunk@45201 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2019-05-23 23:28:53 +00:00
John Blackbourn 239a159ad2 Administration: Don't apply italic formatting to code blocks in setting descriptions. 
Props chetan200891

Fixes #42651

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


git-svn-id: http://core.svn.wordpress.org/trunk@45200 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2019-05-23 23:14:53 +00:00
John Blackbourn 75a8adb0eb Docs: Remove incorrect information about usage of the "from" filters in `wp_mail()`, tidy up formatting. 
See #47110

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


git-svn-id: http://core.svn.wordpress.org/trunk@45199 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2019-05-23 22:42:52 +00:00
John Blackbourn f2ef36bb2d I18N: Use a complete translatable string for the "Delete My Site" email subject. 
Props thrijith

Fixes #46855

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


git-svn-id: http://core.svn.wordpress.org/trunk@45198 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2019-05-23 22:15:54 +00:00
John Blackbourn 9e891be893 Embeds: Remove the "Supports HTTPS" column from the whitelisted oEmbed provider list now that all supported providers use HTTPS. 
See #28507

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


git-svn-id: http://core.svn.wordpress.org/trunk@45197 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2019-05-23 21:23:53 +00:00
John Blackbourn 5fe92586c0 Embeds: Use HTTPS for the Hulu oEmbed endpoint, as it redirects to HTTPS now. 
Fixes #28507

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


git-svn-id: http://core.svn.wordpress.org/trunk@45196 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2019-05-23 21:20:52 +00:00
Sergey Biryukov e32389fc04 I18N: Capitalize "Privacy Policy Page" heading to merge two similar strings. 
Props ramiy, garrett-eclipse.
Fixes #47250.
Built from https://develop.svn.wordpress.org/trunk@45384


git-svn-id: http://core.svn.wordpress.org/trunk@45195 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2019-05-23 21:11:52 +00:00
Sergey Biryukov aaa3e181a0 Twenty Nineteen: Correct function name in a `function_exists()` check for `twentynineteen_get_user_avatar_markup()`. 
Props mukesh27, diego-la-monica.
Fixes #46410.
Built from https://develop.svn.wordpress.org/trunk@45383


git-svn-id: http://core.svn.wordpress.org/trunk@45194 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2019-05-23 01:31:54 +00:00
Sergey Biryukov a3c363f8c2 I18N: Make punctuation in some `wp-admin` strings more consistent. 
Props pedromendonca.
Fixes #47358.
Built from https://develop.svn.wordpress.org/trunk@45382


git-svn-id: http://core.svn.wordpress.org/trunk@45193 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2019-05-23 01:12:53 +00:00
Sergey Biryukov b29ef22665 Media: Correct closing `</label>` tags in `#tmpl-audio-details` and `#tmpl-video-details` after [42444]. 
Props TravisSeitler.
Fixes #47355.
Built from https://develop.svn.wordpress.org/trunk@45381


git-svn-id: http://core.svn.wordpress.org/trunk@45192 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2019-05-23 00:49:53 +00:00
Sergey Biryukov 0cc6547e43 Docs: Adjust `get_post_modified_time` filter DocBlock for consistency with `get_post_time`. 
See #47110.
Built from https://develop.svn.wordpress.org/trunk@45380


git-svn-id: http://core.svn.wordpress.org/trunk@45191 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2019-05-23 00:41:51 +00:00
Sergey Biryukov 3c16bdc538 Date/Time: Return early from `the_weekday()` and `the_weekday_date()` if we're not in the loop. 
Restore `$previousweekday` global usage in `the_weekday_date()`, so it could still be used simultaneously with `the_date()`.

Partially reverts [45378].
See #47354.
Built from https://develop.svn.wordpress.org/trunk@45379


git-svn-id: http://core.svn.wordpress.org/trunk@45190 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2019-05-23 00:38:52 +00:00
Sergey Biryukov ed08643734 Date/Time: Bring some consistency to `the_date()` and `the_weekday_date()`: 
* Make `the_date()` always apply the the filter and return a value.
* Use `is_new_day()` in `the_weekday_date()`.
* Add a unit test for `the_weekday_date()`.

Fixes #47354.
Built from https://develop.svn.wordpress.org/trunk@45378


git-svn-id: http://core.svn.wordpress.org/trunk@45189 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2019-05-22 21:58:50 +00:00
Sergey Biryukov 0b66be9cd7 Docs: Improve documentation for `the_date()` and `the_weekday_date()`. 
Correct type for `$currentday` and `$previousday` globals.

See #47354, #47110.
Built from https://develop.svn.wordpress.org/trunk@45377


git-svn-id: http://core.svn.wordpress.org/trunk@45188 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2019-05-22 21:48:52 +00:00
Andrea Fercia 74c0d658b4 Accessibility: Improve the media views upload Dismiss Errors button. 
- makes the Dismiss Errors button visible in the media views inline uploader
- avoids a focus loss when activating the Dismiss Errors button

See the related GitHub issue from the WPCampus accessibility audit https://github.com/WordPress/gutenberg/issues/15354

Fixes #47113.

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


git-svn-id: http://core.svn.wordpress.org/trunk@45187 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2019-05-22 19:33:53 +00:00
Sergey Biryukov 9785381a8c Date/Time: Use strict comparison in `is_new_day()`, add a unit test. 
Props pbearne.
Fixes #46627.
Built from https://develop.svn.wordpress.org/trunk@45375


git-svn-id: http://core.svn.wordpress.org/trunk@45186 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2019-05-22 17:53:52 +00:00
desrosj 03148046b5 General: Add missing unit tests for `wp_array_slice_assoc()`. 
Props pbearne, desrosj.
Fixes #46638.
Built from https://develop.svn.wordpress.org/trunk@45371


git-svn-id: http://core.svn.wordpress.org/trunk@45182 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2019-05-21 14:49:05 +00:00
desrosj ee92fc277c Feeds: Ensure a feed’s `<lastBuildDate>` has the correct date. 
The maximum modified time for a is currently being determined after an arbitrary date format is applied. Because the string sort in `max()` is being used to return the highest (most recent) modified value, the incorrect date is sometimes returned. This was introduced in [45247].

Props onlanka, Rarsr, mukesh27.
Fixes #47304.
Built from https://develop.svn.wordpress.org/trunk@45367


git-svn-id: http://core.svn.wordpress.org/trunk@45178 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2019-05-20 14:43:02 +00:00
Sergey Biryukov 3b926e0b47 Upgrade/Install: As a follow-up to [45357], when linking to Update PHP support page in error messages, check if `wp_get_update_php_url()` and `wp_get_update_php_annotation()` exist. 
`wp-admin/includes/update-core.php` runs in the context of the previous WordPress version. Any calls to newly introduced functions there need to be checked via `function_exists()`.

Reviewed by desrosj, earnjam, SergeyBiryukov.

Props dd32, imath.
Fixes #47323.
Built from https://develop.svn.wordpress.org/trunk@45365


git-svn-id: http://core.svn.wordpress.org/trunk@45176 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2019-05-20 14:29:55 +00:00
Peter Wilson 460e256026 KSES: Add `flex` and related long form properties to safe CSS. 
Allow `flex`, `flex-grow`, `flex-shrink` and `flex-basis` to be used in inline CSS. As of WordPress 5.3 the block editor is expected to use `flex-basis` inline to set the width in the column block.

Props aduth.
Fixes #47281.
See #37248.


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


git-svn-id: http://core.svn.wordpress.org/trunk@45174 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2019-05-18 04:34:52 +00:00
Sergey Biryukov f29eba6662 Taxonomy: In `wp_insert_term()`, handle an error if writing to the `term_taxonomy` table fails. 
This complements the check for successful writing to the `terms` table, added in [7430].

Props mbabker.
Fixes #47313.
Built from https://develop.svn.wordpress.org/trunk@45362


git-svn-id: http://core.svn.wordpress.org/trunk@45173 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2019-05-17 22:28:51 +00:00
Sergey Biryukov f72cb6dc83 Upgrade/Install: Improve error messages displayed when WordPress update fails due to an incompatible PHP version by linking to the Update PHP support page. 
Additionally, fix a regression in [44451] where the error message in `wp-admin/upgrade.php` was prepared, but never displayed.

Props afragen, netweb, hareesh-pillai, SergeyBiryukov.
Fixes #46937.
Built from https://develop.svn.wordpress.org/trunk@45357


git-svn-id: http://core.svn.wordpress.org/trunk@45168 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2019-05-17 18:11:51 +00:00
Sergey Biryukov ea8078f73c Media: Fix deletion of files on Windows. 
`wp_delete_file_from_directory()` should always normalize file paths before comparing.

Props tonybogdanov, SergeyBiryukov.
Fixes #47185.
Built from https://develop.svn.wordpress.org/trunk@45352


git-svn-id: http://core.svn.wordpress.org/trunk@45163 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2019-05-17 13:30:02 +00:00
Sergey Biryukov 550bc5cad2 Build/Test Tools: Use a non-zero exit code in `wp_check_php_mysql_versions()` when minimum PHP or MySQL requirements are not met. 
This allows automated scripts and test suites to interpret the result correctly.

Props jrf, spacedmonkey.
Fixes #47169.
Built from https://develop.svn.wordpress.org/trunk@45350


git-svn-id: http://core.svn.wordpress.org/trunk@45161 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2019-05-17 12:34:52 +00:00
Sergey Biryukov c1f6c6877c Formatting: Adjust `wp_targeted_link_rel()` to ensure JSON format is preserved and correct quotes are used when adding the missing `rel` attribute. 
Props birgire, TobiasBg, fierevere, audrasjb, SergeyBiryukov.
Fixes #46316, #47244.
Built from https://develop.svn.wordpress.org/trunk@45348


git-svn-id: http://core.svn.wordpress.org/trunk@45159 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2019-05-17 12:10:02 +00:00
Sergey Biryukov e68fe165ae Site Health: In PHP modules test description, move the space before the screen reader text out from the translatable string. 
Props ocean90, tobifjellner.
Fixes #47161.
Built from https://develop.svn.wordpress.org/trunk@45346


git-svn-id: http://core.svn.wordpress.org/trunk@45157 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2019-05-17 11:50:58 +00:00
tellyworth 1d730f20e5 Upgrade/Install: Don't run signature verify on slow 32-bit systems. 
The sodium_compat library can be very slow for certain operations on 32-bit architectures, which can lead to web server timeouts while attempting to verify an update. This adds a runtime speed check to skip signature verification on systems that would otherwise time out. Includes simple unit tests.

Props dd32, paragoninitiativeenterprises.
See #47186.

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


git-svn-id: http://core.svn.wordpress.org/trunk@45156 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2019-05-17 11:06:53 +00:00
tellyworth b9782736b6 Upgrade/Install: Update sodium_compat to v1.10.0. 
This adds a runtime_speed_test() method for estimating if the 32-bit implementation is fast enough for expensive computations.

Props paragoninitiativeenterprises.
See #47186.

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


git-svn-id: http://core.svn.wordpress.org/trunk@45155 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2019-05-17 10:58:51 +00:00
Andrew Ozz 80aee4ae87 jQuery: bring jquery.js back into the WordPress SVN repo and backport the patch from 3.4.0. 
Props MikeNGarrett, peterwilsoncc, azaozz.
Fixes #47020 for trunk.
Built from https://develop.svn.wordpress.org/trunk@45342


git-svn-id: http://core.svn.wordpress.org/trunk@45153 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2019-05-17 04:25:54 +00:00
Sergey Biryukov e06afa8a80 Accessibility: In back-compat code added for `get_search_form()` in [44956], when checking the (previously boolean) `$args` value, account for non-strict comparison. 
Props dkarfa, sachyya-sachet.
Fixes #47177. See #42057.
Built from https://develop.svn.wordpress.org/trunk@45340


git-svn-id: http://core.svn.wordpress.org/trunk@45151 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2019-05-17 02:22:53 +00:00
Sergey Biryukov 00255ae0be Help/About: Restore placeholder for WordPress version in tagline on About, Credits, and Freedoms pages to include minor versions. 
Props desrosj, mukesh27.
Fixes #46408.
Built from https://develop.svn.wordpress.org/trunk@45338


git-svn-id: http://core.svn.wordpress.org/trunk@45149 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2019-05-17 01:08:53 +00:00
Sergey Biryukov cbad1109f4 Site Health: Use correct singular string for plugin and theme version tests. 
Props edocev, Presskopp.
Fixes #47264.
Built from https://develop.svn.wordpress.org/trunk@45336


git-svn-id: http://core.svn.wordpress.org/trunk@45147 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2019-05-17 01:00:54 +00:00
Sergey Biryukov 4236a3522d I18N: Avoid using placeholders for link start and end tags in alt text description strings added in [45158]. 
Use an established pattern of moving additional link attributes out of the translatable string.

Props dimadin.
Fixes #47159.
Built from https://develop.svn.wordpress.org/trunk@45334


git-svn-id: http://core.svn.wordpress.org/trunk@45145 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2019-05-17 00:53:54 +00:00
Sergey Biryukov a9fc042377 Site Health: In PHP modules test, ensure the description is translated as a whole sentence, not as separate string parts. 
Props dimadin, SergeyBiryukov.
Fixes #47161.
Built from https://develop.svn.wordpress.org/trunk@45331


git-svn-id: http://core.svn.wordpress.org/trunk@45142 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2019-05-17 00:07:54 +00:00
Sergey Biryukov 9c1a666249 Site Health: In HTTP requests test, when checking whether the `WP_HTTP_BLOCK_EXTERNAL` constant is defined, check its value as well. 
Props chesio.
Fixes #47297.
Built from https://develop.svn.wordpress.org/trunk@45328


git-svn-id: http://core.svn.wordpress.org/trunk@45139 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2019-05-16 22:08:54 +00:00
desrosj c6da25fa9a Privacy: Prevent email field for personal data requests from overflowing. 
Props anischarolia, ianbelanger, afercia.
Fixes #46961.
Built from https://develop.svn.wordpress.org/trunk@45326


git-svn-id: http://core.svn.wordpress.org/trunk@45137 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2019-05-16 20:45:54 +00:00
desrosj 1ef254a465 Menus: Fix alignment of menu actions on mobile. 
In [41197], changes were made to improve the responsive view for the Menu Name field and Save buttons. This caused the Delete Menu button to be misaligned.

Props ianbelanger, audrasjb, afercia, mukesh27.
Fixes #47173.
Built from https://develop.svn.wordpress.org/trunk@45324


git-svn-id: http://core.svn.wordpress.org/trunk@45135 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2019-05-16 19:05:53 +00:00
desrosj ca7c9a8288 Site Health: Improve alignment and spacing for section headers. 
This changes the CSS for Site Health headers to use flexbox, which helps ensure the text is vertically aligned center and consistently spaced in both the Status and Info tabs. It also fixes an issue where the loading spinner GIF was cut off on smaller screens (originally reported in #47203.

Props Presskopp, odminstudios, kjellr, afercia, desrosj, hedgefield, ianbelanger, xavortm.
Fixes #47063.
Built from https://develop.svn.wordpress.org/trunk@45322


git-svn-id: http://core.svn.wordpress.org/trunk@45133 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2019-05-16 18:30:53 +00:00
desrosj 913516fe5c Build/Test Tools: Upgrade `node-sass` to 4.12.0. 
`node-sass` 4.12 adds support for Node 12. This will prevent errors for anyone running Node 12 locally instead of the LTS version (currently 10.15.3).

Props desrosj, aduth, netweb.
Fixes #47257.
Built from https://develop.svn.wordpress.org/trunk@45321


git-svn-id: http://core.svn.wordpress.org/trunk@45132 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2019-05-16 18:15:55 +00:00
aduth 3c44f9e15a Block Editor: Upgrade WordPress packages to the latest versions. 
Updated packages:

 - @wordpress/annotations@1.2.3
 - @wordpress/block-editor@2.0.2
 - @wordpress/block-library@2.4.5
 - @wordpress/blocks@6.2.5
 - @wordpress/components@7.3.2
 - @wordpress/dom@2.2.5
 - @wordpress/e2e-tests@1.1.5
 - @wordpress/edit-post@3.3.5
 - @wordpress/editor@9.2.5
 - @wordpress/format-library@1.4.5
 - @wordpress/list-reusable-blocks@1.3.5
 - @wordpress/nux@3.2.5
 - @wordpress/rich-text@3.2.3

Props: youknowriad, gwwar, iseulde, tfrommen, gziolo.

Fixes #47284.

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


git-svn-id: http://core.svn.wordpress.org/trunk@45130 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2019-05-16 18:08:00 +00:00
Andrew Ozz 0b4a421b50 Build tools: fix generating `*-rtl.css` files in `wp-includes/css` after `grunt --dev` was used. 
Fixes #47078.
Built from https://develop.svn.wordpress.org/trunk@45317


git-svn-id: http://core.svn.wordpress.org/trunk@45128 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2019-05-16 02:25:52 +00:00
Andrew Ozz 762b49653a Update TinyMCE to 4.9.4. Changelog: https://github.com/tinymce/tinymce/blob/4.x/changelog.txt. 
Fixes #47229 for trunk.
Built from https://develop.svn.wordpress.org/trunk@45316


git-svn-id: http://core.svn.wordpress.org/trunk@45127 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2019-05-15 23:45:52 +00:00
desrosj ac095904da Bootstrap/Load: Prevent PHP errors when a drop-in triggers fatal error protection. 
When a drop-in (such as `advanced-cache.php`) contains a PHP error, additional PHP errors are caused when displaying the error protection screen because `load_default_textdomain()` and `WP_Error` are not yet available.

Though recovery mode is not supported for `mu-plugins` and drop-ins, fatal error protection is. This change ensures the error screen is displayed when a fatal error is encountered within a drop-in and not a white screen.

Props TimothyBlynJacobs, spacedmonkey, daxelrod.
Fixes #47265.
Built from https://develop.svn.wordpress.org/trunk@45311


git-svn-id: http://core.svn.wordpress.org/trunk@45122 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2019-05-15 18:19:51 +00:00
desrosj 5173099abc Administration: Remove duplicate `font-face` declaration in Dashicons CSS. 
This was causing console warnings in some browsers.

Props aduth, joen, afercia, timph, ianbelanger.
Fixes #47183.
Built from https://develop.svn.wordpress.org/trunk@45310


git-svn-id: http://core.svn.wordpress.org/trunk@45121 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2019-05-15 16:08:57 +00:00
desrosj f48f926077 Site Health: Improve vertical alignment of icons in test result descriptions. 
This change removes redundant CSS properties for different health check statuses in favor of utilizing the `.dashicons` class already in Core to define them more consistently. This also fixes the vertical alignment issues.

Props chetan200891, Clorith, desrosj.
Fixes #46940.
Built from https://develop.svn.wordpress.org/trunk@45309


git-svn-id: http://core.svn.wordpress.org/trunk@45120 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2019-05-15 14:26:07 +00:00
desrosj 7d04482650 Site Health: Link to the correct plugin update screen in multisite installs. 
Props Clorith, sebastienserre, jeremyfelt, desrosj.
Fixes #47189.
Built from https://develop.svn.wordpress.org/trunk@45308


git-svn-id: http://core.svn.wordpress.org/trunk@45119 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2019-05-15 14:13:05 +00:00
Dion Hulse 745c50d7af Bump Akismet external to 4.1.2. 
See #WP47269.


git-svn-id: http://core.svn.wordpress.org/trunk@45117 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2019-05-15 04:26:57 +00:00
Sergey Biryukov 1a24aaa380 Docs: Add a `@see` reference to `WP_REST_Revisions_Controller` in `WP_REST_Autosaves_Controller` DocBlock. 
Props chintan1896.
Fixes #47232.
Built from https://develop.svn.wordpress.org/trunk@45307


git-svn-id: http://core.svn.wordpress.org/trunk@45116 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2019-05-14 23:53:57 +00:00