Sergey Biryukov
ced8fb20a1
Code Modernization: Remove error suppression from `parse_url()` calls.
...
Previously, the `@` operator was used to prevent possible warnings emitted by `parse_url()` in PHP < 5.3.3 when URL parsing failed.
Now that the minimum version of PHP required by WordPress is 5.6.20, this is no longer needed.
Props netpassprodsr, Howdy_McGee.
Fixes #49980 . See #24780 .
Built from https://develop.svn.wordpress.org/trunk@47617
git-svn-id: http://core.svn.wordpress.org/trunk@47392 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-04-24 07:28:10 +00:00
Andrew Ozz
0e38f8ed26
Media: Enable lazy-loading of images by automatically adding the new `loading="lazy"` attribute to image tags on the front-end.
...
- Introduces `wp_lazy_loading_enabled()`, `wp_filter_content_tags()`, `wp_img_tag_add_loading_attr()`, and `wp_img_tag_add_srcset_and_sizes_attr()` functions.
- Introduces `wp_lazy_loading_enabled`, `wp_img_tag_add_loading_attr`, and `wp_img_tag_add_srcset_and_sizes_attr` filters.
Props flixos90, addyosmani, mor10, swissspidy, pierlo, westonruter, spacedmonkey, mikeschroder, jonoaldersonwp, peterwilsoncc, narwen, jeffpaul, OptimizingMatters, futtta, mukeshpanchal27, azaozz.
Fixes #44427 .
Built from https://develop.svn.wordpress.org/trunk@47554
git-svn-id: http://core.svn.wordpress.org/trunk@47329 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-04-08 00:55:07 +00:00
Sergey Biryukov
195312ead2
Users: Pass the ID of the user that was logged out to the `wp_logout` action.
...
Props donmhico, figureone, TimothyBlynJacobs, rebasaurus.
Fixes #49533 .
Built from https://develop.svn.wordpress.org/trunk@47553
git-svn-id: http://core.svn.wordpress.org/trunk@47328 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-04-07 16:14:10 +00:00
Sergey Biryukov
38676936ba
Coding Standards: Use strict type check for `in_array()` and `array_search()` where strings are involved.
...
This reduces the number of `WordPress.PHP.StrictInArray.MissingTrueStrict` issues from 486 to 50.
Includes minor code layout fixes for better readability.
See #49542 .
Built from https://develop.svn.wordpress.org/trunk@47550
git-svn-id: http://core.svn.wordpress.org/trunk@47325 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-04-05 03:02:11 +00:00
John Blackbourn
7004afe4f4
Docs: Various docblock corrections and improvements.
...
See #49572
Built from https://develop.svn.wordpress.org/trunk@47461
git-svn-id: http://core.svn.wordpress.org/trunk@47248 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-03-16 18:40:07 +00:00
John Blackbourn
251d77e1a1
Docs: Miscellaneous docs fixes and improvements.
...
See #48303 .
Built from https://develop.svn.wordpress.org/trunk@47398
git-svn-id: http://core.svn.wordpress.org/trunk@47185 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-03-01 10:40:07 +00:00
John Blackbourn
056dad9c2c
Docs: Use more specific types in parameter descriptions in place of `mixed`.
...
See #48303 .
Built from https://develop.svn.wordpress.org/trunk@47397
git-svn-id: http://core.svn.wordpress.org/trunk@47184 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-03-01 10:38:07 +00:00
Sergey Biryukov
641c632b0c
Coding Standards: Use Yoda conditions where appropriate.
...
See #49222 .
Built from https://develop.svn.wordpress.org/trunk@47219
git-svn-id: http://core.svn.wordpress.org/trunk@47019 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-02-09 16:55:09 +00:00
Sergey Biryukov
47ed56f38f
Code Modernization: Replace `dirname( __FILE__ )` calls with `__DIR__` magic constant.
...
This avoids the performance overhead of the function call every time `dirname( __FILE__ )` was used instead of `__DIR__`.
This commit also includes:
* Removing unnecessary parentheses from `include`/`require` statements. These are language constructs, not function calls.
* Replacing `include` statements for several files with `require_once`, for consistency:
* `wp-admin/admin-header.php`
* `wp-admin/admin-footer.php`
* `wp-includes/version.php`
Props ayeshrajans, desrosj, valentinbora, jrf, joostdevalk, netweb.
Fixes #48082 .
Built from https://develop.svn.wordpress.org/trunk@47198
git-svn-id: http://core.svn.wordpress.org/trunk@46998 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-02-06 06:33:11 +00:00
Sergey Biryukov
deb1886078
Accessibility: Text Changes: Use sentence case for the word `Error` in various error messages, instead of all caps.
...
Using all caps should be avoided for better readability and because screen readers may pronounce all-caps words as abbreviations.
Props afercia, ryokuhi, sabernhardt, garrett-eclipse.
See #47656 , #43037 , #42945 .
Built from https://develop.svn.wordpress.org/trunk@47156
git-svn-id: http://core.svn.wordpress.org/trunk@46956 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-02-01 21:38:04 +00:00
Sergey Biryukov
001ffe81fb
Docs: Improve inline comments per the documentation standards.
...
Includes minor code layout fixes for better readability.
See #48303 .
Built from https://develop.svn.wordpress.org/trunk@47122
git-svn-id: http://core.svn.wordpress.org/trunk@46922 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-01-29 00:45:18 +00:00
Sergey Biryukov
c7bab2b410
Comments: Add `In reply to: %s` parent comment link to new comment email notifications.
...
This information was previously available on the Moderate Comment screen in the admin, but was missing from moderation emails.
Props imath, danieltj, andraganescu, galbaras, SergeyBiryukov.
Fixes #43805 . See #43429 .
Built from https://develop.svn.wordpress.org/trunk@47114
git-svn-id: http://core.svn.wordpress.org/trunk@46914 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2020-01-27 04:33:04 +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
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
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
d273235abd
Login/Registration: Pass the error data to the `wp_login_failed` action.
...
Props hamedmoodi, rixeo.
Fixes #49007 .
Built from https://develop.svn.wordpress.org/trunk@46971
git-svn-id: http://core.svn.wordpress.org/trunk@46771 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-12-17 15:36:01 +00:00
Sergey Biryukov
aa919cd160
Comments: Optimize the query for pending comments count in `wp_notify_moderator()` for better performance on large tables.
...
Props sgoen.
Fixes #48514 .
Built from https://develop.svn.wordpress.org/trunk@46878
git-svn-id: http://core.svn.wordpress.org/trunk@46678 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-12-10 13:47:00 +00:00
Sergey Biryukov
b5bf852dfe
Build/Test Tools: Adjust the test for `wp_redirect()` status codes added in [46641] per the documentation and coding standards.
...
Move the test to a more appropriate place for consistency with `wp_sanitize_redirect()` and `wp_validate_redirect()` tests.
See #44317 .
Built from https://develop.svn.wordpress.org/trunk@46649
git-svn-id: http://core.svn.wordpress.org/trunk@46449 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-11-04 12:59:01 +00:00
Aaron Jorbin
946217dcca
General: wp_safe_redirect() and wp_redirect() shouldn't allow non-3xx status codes
...
Redirects should use redirect status codes and if you attempt to call wp_safe_redirect or wp_redirect with a non redirect status it can lead to undesired behavior and head scratching.
Fixes #44317 .
Props spenserhale, johnbillion, mjnewman for initial patch.
Built from https://develop.svn.wordpress.org/trunk@46641
git-svn-id: http://core.svn.wordpress.org/trunk@46441 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-11-03 22:10:02 +00:00
John Blackbourn
ac6bf7666c
Docs: Add missing docs for the `auth_cookie_bad_session_token` action.
...
See #48303
Built from https://develop.svn.wordpress.org/trunk@46598
git-svn-id: http://core.svn.wordpress.org/trunk@46395 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-10-26 23:46:00 +00:00
John Blackbourn
3caaa40fc6
Docs: Switch more docs over to typed array notation, plus some fixes.
...
See #48303 , #41756
Built from https://develop.svn.wordpress.org/trunk@46596
git-svn-id: http://core.svn.wordpress.org/trunk@46393 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-10-26 21:09:04 +00:00
whyisjake
b183fd1cca
Administration: Ensure that admin referer nonce is valid.
...
Coding standards, ensure that nonce is valid with identical, rather then equal operator.
Props vortfu, xknown, whyisjake.
Built from https://develop.svn.wordpress.org/trunk@46477
git-svn-id: http://core.svn.wordpress.org/trunk@46275 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-10-14 15:40:04 +00:00
Sergey Biryukov
9db44754b9
Formatting: In `wp_validate_redirect()`, normalize the path when validating the location for relative URLs, to account for Windows paths.
...
Props peterwilsoncc, rconde, jmmathc, mat-lipe, Sixes, justinahinon, cmagrin, daxelrod, SergeyBiryukov.
Fixes #47980 .
Built from https://develop.svn.wordpress.org/trunk@46472
git-svn-id: http://core.svn.wordpress.org/trunk@46270 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-10-14 10:52:04 +00:00
Sergey Biryukov
634242343c
Users: Make sure `wp_logout()` clears current user, so that a subsequent call to `is_user_logged_in()` works as expected.
...
Props sebastian.pisula, donmhico, roytanck, juliobox.
Fixes #35488 .
Built from https://develop.svn.wordpress.org/trunk@46467
git-svn-id: http://core.svn.wordpress.org/trunk@46265 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-10-12 03:10:03 +00:00
Sergey Biryukov
b78a40aa4c
Formatting: Make sure `wp_sanitize_redirect()` encodes spaces in URLs instead of stripping them out.
...
Props donmhico, hlashbrooke, dd32, azaozz.
Fixes #36998 .
Built from https://develop.svn.wordpress.org/trunk@46462
git-svn-id: http://core.svn.wordpress.org/trunk@46260 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-10-11 23:54:03 +00:00
John Blackbourn
e36d1bcbd8
Docs: Docblock corrections and improvements, mostly related to various `pre_*` filters.
...
See #47110
Built from https://develop.svn.wordpress.org/trunk@46232
git-svn-id: http://core.svn.wordpress.org/trunk@46044 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-09-21 17:41:57 +00:00
Sergey Biryukov
c5fe7878ec
Coding Standards: Fix WPCS issue in [46115].
...
See #43542 .
Built from https://develop.svn.wordpress.org/trunk@46116
git-svn-id: http://core.svn.wordpress.org/trunk@45928 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-09-14 20:42:56 +00:00
Sergey Biryukov
18bf922527
Mail: Avoid setting duplicate `MIME-Version` and `X-Mailer` headers in `wp_mail()`, they are added automatically by PHPMailer.
...
Props lbenicio, junktrunk, danieltj, studyboi, bennemann.
Fixes #43542 .
Built from https://develop.svn.wordpress.org/trunk@46115
git-svn-id: http://core.svn.wordpress.org/trunk@45927 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-09-14 20:14:54 +00:00
Sergey Biryukov
c86ee39ff4
Improve URL validation in `wp_validate_redirect()`.
...
Props vortfu, whyisjake, peterwilsoncc.
Built from https://develop.svn.wordpress.org/trunk@45971
git-svn-id: http://core.svn.wordpress.org/trunk@45782 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-09-04 16:57:56 +00:00
Sergey Biryukov
e199663322
I18N: Capitalize translator comments consistently, add trailing punctuation.
...
Includes minor code layout fixes.
See #44360 .
Built from https://develop.svn.wordpress.org/trunk@45932
git-svn-id: http://core.svn.wordpress.org/trunk@45743 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-09-03 00:41:05 +00:00
Sergey Biryukov
16b8d91baa
I18N: Improve translator comments.
...
* Add missing translator comments.
* Fix placement of some translator comments. Translator comments should be on the line directly above the line containing the translation function call for optimal compatibility with various `.pot` file generation tools. The CS auto-fixing, which changed some inconsistent function calls to multi-line function calls, is part of the reason why this was no longer the case for a select group of translator comments.
Includes minor code layout fixes.
Polyglots, rejoice! All WordPress core files now have translator comments for all strings with placeholders!
Props jrf, subrataemfluence, GaryJ, webdados, Dency, swissspidy, alvarogois, marcomartins, mihaiiceyro, vladwtz, niq1982, flipkeijzer, michielatyoast, chandrapatel, thrijith, joshuanoyce, FesoVik, tessak22, bhaktirajdev, cleancoded, dhavalkasvala, garrett-eclipse, bibliofille, socalchristina, priyankkpatel, 5hel2l2y, adamsilverstein, JeffPaul, pierlo, SergeyBiryukov.
Fixes #44360 .
Built from https://develop.svn.wordpress.org/trunk@45926
git-svn-id: http://core.svn.wordpress.org/trunk@45737 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-09-01 17:13:59 +00:00
Sergey Biryukov
7fd6077864
Docs: Improve documentation for `auth_redirect()`.
...
Props atachibana.
Fixes #47956 .
Built from https://develop.svn.wordpress.org/trunk@45924
git-svn-id: http://core.svn.wordpress.org/trunk@45735 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-09-01 13:03:55 +00:00
Sergey Biryukov
aa8e2ff3ba
Docs: Improve documentation for `wp_set_auth_cookie()` and related functions.
...
Props arafat, SergeyBiryukov.
Fixes #47886 .
Built from https://develop.svn.wordpress.org/trunk@45822
git-svn-id: http://core.svn.wordpress.org/trunk@45633 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-08-17 13:23:55 +00:00
Sergey Biryukov
64290005f5
Docs: Document the `show_split_view` argument for `wp_text_diff()`.
...
Convert `$args` array documentation to hash notation.
Props riddhiehta02, jeremyfelt, SergeyBiryukov.
Fixes #47224 .
Built from https://develop.svn.wordpress.org/trunk@45778
git-svn-id: http://core.svn.wordpress.org/trunk@45589 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-08-10 22:28:54 +00:00
Sergey Biryukov
ee5e044a2a
Users: Use `clean_user_cache()` in `wp_insert_user()`, `wp_update_user()`, `wp_set_password()`, `add_user_to_blog()`.
...
Props spacedmonkey.
Fixes #47021 .
Built from https://develop.svn.wordpress.org/trunk@45715
git-svn-id: http://core.svn.wordpress.org/trunk@45526 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-08-01 17:49:57 +00:00
Sergey Biryukov
4a6461dcc2
Users: Use `get_password_reset_key()` in `wp_new_user_notification()`.
...
Props mrasharirfan, spacedmonkey.
Fixes #45745 .
Built from https://develop.svn.wordpress.org/trunk@45712
git-svn-id: http://core.svn.wordpress.org/trunk@45523 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-08-01 15:30:58 +00:00
Gary Pendergast
abcbee954f
Coding Standards: Fix instances of `WordPress.PHP.NoSilencedErrors.Discouraged`.
...
Noteable changes:
- The `magic_quotes_runtime` and `magic_quotes_sybase` settings were removed in PHP 5.4, so no longer need to be set.
- Some functions that use external libraries can generate errors that can't be tested for, so are globally allowed to silence errors.
- Quite a few functions would cause errors if `safe_mode` was set. This setting was removed in PHP 5.4.
- Only a handful of `header()` calls needed corresponding `headers_sent()` checks for unit tests to pass, but more may need to be added as the nightlies builds are tested.
See #46732 .
Built from https://develop.svn.wordpress.org/trunk@45611
git-svn-id: http://core.svn.wordpress.org/trunk@45422 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-07-09 05:45:58 +00:00
Gary Pendergast
4803fc405e
Coding Standards: Fix the `Squiz.PHP.DisallowMultipleAssignments` violations in `wp-includes`.
...
See #47632 .
Built from https://develop.svn.wordpress.org/trunk@45590
git-svn-id: http://core.svn.wordpress.org/trunk@45401 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-07-02 23:42:58 +00:00
Sergey Biryukov
573daa129c
Users: Pass `$length`, `$special_chars`, and `$extra_special_chars` parameters to the `random_password` filter in `wp_generate_password()`.
...
Props roytanck.
Fixes #47092 .
Built from https://develop.svn.wordpress.org/trunk@45568
git-svn-id: http://core.svn.wordpress.org/trunk@45379 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-06-27 00:48:53 +00:00
John Blackbourn
bab5ed2df5
Docs: Correct and improve the docs for a few nonce-related functions.
...
See #47110
Built from https://develop.svn.wordpress.org/trunk@45565
git-svn-id: http://core.svn.wordpress.org/trunk@45376 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-06-25 17:07:52 +00:00
Sergey Biryukov
aa59cb8359
Docs: Correct parameter name for `wp_new_user_notification_email_admin` filter.
...
Props needle.
Fixes #47476 .
Built from https://develop.svn.wordpress.org/trunk@45489
git-svn-id: http://core.svn.wordpress.org/trunk@45300 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-06-04 12:48:55 +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
Sergey Biryukov
b36a31ae14
Docs: Fix typo in `wp_mail()` description.
...
Props seedsca.
Fixes #47208 .
Built from https://develop.svn.wordpress.org/trunk@45302
git-svn-id: http://core.svn.wordpress.org/trunk@45111 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-05-10 09:53:54 +00:00
John Blackbourn
d4d1267847
I18N: Improvements to and additions of translator comments for various email subject strings.
...
Props ramiy
Fixes #46920
Built from https://develop.svn.wordpress.org/trunk@45204
git-svn-id: http://core.svn.wordpress.org/trunk@45013 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-04-15 22:39:50 +00:00
desrosj
79f8d9786d
Text Changes: Use simpler language for login detail email subjects.
...
Props: peterwilsoncc, desrosj.
Fixes #37940 .
Built from https://develop.svn.wordpress.org/trunk@45173
git-svn-id: http://core.svn.wordpress.org/trunk@44982 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-04-12 18:16:52 +00:00
Gary Pendergast
9a80e2095b
Text Changes: Tweak the wording of email notification subjects.
...
This change brings more coherence between the subject lines of the various emails WordPress will send.
Props ramiy, pento.
Fixes #37940 .
Built from https://develop.svn.wordpress.org/trunk@45137
git-svn-id: http://core.svn.wordpress.org/trunk@44946 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-04-08 06:17:51 +00:00
Sergey Biryukov
931f8046d3
Docs: Improve wording in a comment in `wp_set_current_user()`.
...
Props nielsdeblaauw.
Fixes #45032 .
Built from https://develop.svn.wordpress.org/trunk@44826
git-svn-id: http://core.svn.wordpress.org/trunk@44658 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-03-11 10:57:55 +00:00
Gary Pendergast
655d44ffe8
Users: Add extra checking to `wp_new_user_notification()`.
...
Prevent a notification from being sent when an unrecognised value is passed in the `$notify` parameter.
Props cthreelabs, 360zen.
Fixes #44293 .
Built from https://develop.svn.wordpress.org/trunk@44611
git-svn-id: http://core.svn.wordpress.org/trunk@44442 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-01-16 04:27:50 +00:00
desrosj
8f3ee6d243
Docs: Update `since` tag for `X-Redirect-By` header additions.
...
See [42408-42409], [42633], [42647].
Fixes #42313 .
Built from https://develop.svn.wordpress.org/trunk@44386
git-svn-id: http://core.svn.wordpress.org/trunk@44216 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2019-01-03 18:11:52 +00:00
Gary Pendergast
bfc53e6a52
i18n: Improve consistency of translator comments.
...
Props ramonopoly.
Fixes #44998 .
Built from https://develop.svn.wordpress.org/trunk@43668
git-svn-id: http://core.svn.wordpress.org/trunk@43497 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2018-10-02 19:51:24 +00:00