Weston Ruter
a5f8e0917f
Editor: Disable `wp_keep_scroll_position` in IE11 since buggy; fix `matches` polyfill conflict with ME.js by doing runtime feature detection in context window.
...
Props westonruter, SergeyBiryukov, Clorith for testing.
See #41962 , #42029 .
Fixes #42553 for 4.9.
Built from https://develop.svn.wordpress.org/branches/4.9@42192
git-svn-id: http://core.svn.wordpress.org/branches/4.9@42022 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2017-11-15 19:00:38 +00:00
Weston Ruter
73615e0bc4
File Editor: Eliminate gap inserted between code editor and heading in IE11 when CodeMirror initializes.
...
Props afercia, melchoyce, Clorith for testing, SergeyBiryukov for testing.
See #12423 .
Fixes #42554 for 4.9.
Built from https://develop.svn.wordpress.org/branches/4.9@42190
git-svn-id: http://core.svn.wordpress.org/branches/4.9@42020 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2017-11-15 18:31:37 +00:00
Weston Ruter
567de560e9
Customize: Prevent themes panel from auto-expanding in IE11.
...
In IE11 the `input` event erroneously gets triggered initially without any user input.
Amends [41648].
See #37661 .
Fixes #42556 for 4.9.
Built from https://develop.svn.wordpress.org/branches/4.9@42188
git-svn-id: http://core.svn.wordpress.org/branches/4.9@42018 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2017-11-15 18:13:40 +00:00
Weston Ruter
ff85340727
Widgets: Set global `$post` to current queried object instead of nullifying when `is_singular()` while applying filters (and shortcodes) in Text widget and (via plugin) Custom HTML widget.
...
Also prevent `[gallery]` shortcode from dumping out every attachment on the site when a containing Text widget is shown on an archive template.
Props westonruter, bobbingwide, joemcgill for testing.
See #10457 .
Fixes #42548 , #42547 for 4.9.
Built from https://develop.svn.wordpress.org/branches/4.9@42186
git-svn-id: http://core.svn.wordpress.org/branches/4.9@42016 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2017-11-15 02:33:44 +00:00
Weston Ruter
ecf8680978
Editor: Improve scrolling behavior and prevent autosave logic from causing dirty state when just switching between Visual and Text tabs.
...
Props pento.
See #41962 , #42029 .
Fixes #42530 for 4.9.
Built from https://develop.svn.wordpress.org/branches/4.9@42184
git-svn-id: http://core.svn.wordpress.org/branches/4.9@42014 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2017-11-15 00:22:42 +00:00
Weston Ruter
36282a2a9c
About Page: Fix issue with overlapping images and text on IE11 and Edge 15.
...
Props Clorith, ryelle, afercia, la-geek, SergeyBiryukov.
See #42087 .
Fixes #42545 for 4.9
Built from https://develop.svn.wordpress.org/branches/4.9@42182
git-svn-id: http://core.svn.wordpress.org/branches/4.9@42012 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2017-11-14 23:04:40 +00:00
Weston Ruter
44eb69904d
Post WordPress 4.9 RC3 bump.
...
Built from https://develop.svn.wordpress.org/branches/4.9@42180
git-svn-id: http://core.svn.wordpress.org/branches/4.9@42010 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2017-11-14 06:51:41 +00:00
Weston Ruter
ce6b628972
WordPress 4.9 RC3.
...
Built from https://develop.svn.wordpress.org/branches/4.9@42179
git-svn-id: http://core.svn.wordpress.org/branches/4.9@42009 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2017-11-14 06:08:40 +00:00
Weston Ruter
0110751ddc
Editor: Cease adding paragraphs when switching editor tabs.
...
Fixes an error since [41783] in which extra paragraphs could be added to content when switching editor tabs.
Props pento, adamsilverstein, aduth.
Fixes #42531 for 4.9.
Built from https://develop.svn.wordpress.org/branches/4.9@42178
git-svn-id: http://core.svn.wordpress.org/branches/4.9@42008 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2017-11-14 05:28:41 +00:00
Gary Pendergast
5e736b62e0
Editor: When switching Editor tabs, don't scroll unnecessarily.
...
- When switching to the Text view, wait until after the Visual editor element has been hidden, before focussing the `<textarea>`.
- When switching to the Visual view, only scroll if the cursor is not visible on the current screen.
Merge of 52175 to the 4.9 branch.
Fixes #42530 .
Built from https://develop.svn.wordpress.org/branches/4.9@42176
git-svn-id: http://core.svn.wordpress.org/branches/4.9@42006 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2017-11-14 05:21:39 +00:00
Weston Ruter
eb18399c10
About: Fix jumping behavior for titles and columns when scrolling.
...
Props ryelle.
See #42087 .
Fixes #42514 , #42526 for 4.9.
Built from https://develop.svn.wordpress.org/branches/4.9@42174
git-svn-id: http://core.svn.wordpress.org/branches/4.9@42004 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2017-11-13 22:48:36 +00:00
Weston Ruter
c268b2f28c
Customize: Allow notifications for linting errors in code editor control (for Additional CSS) to be overridden to allow saving.
...
Implements the same override that was implemented in [41721] for the theme/plugin editors.
See #41897 , #41887 .
Fixes #42528 for 4.9.
Built from https://develop.svn.wordpress.org/branches/4.9@42172
git-svn-id: http://core.svn.wordpress.org/branches/4.9@42002 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2017-11-13 22:47:12 +00:00
Weston Ruter
15b14c30c1
Customize: Prevent PHP notice on theme-switch dashboard welcome link (and link to themes admin screen) when user cannot `customize`.
...
Props skostadinov, ocean90.
Amends [41699].
See #42050 .
Fixes #42525 for 4.9.
Built from https://develop.svn.wordpress.org/branches/4.9@42170
git-svn-id: http://core.svn.wordpress.org/branches/4.9@42000 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2017-11-13 22:45:47 +00:00
Dominik Schilling
0d7f326477
Build: Add `npm-shrinkwrap.json`.
...
For compatibility with the build server `fsevent` has been manually removed.
Props netweb.
See #42483 .
Built from https://develop.svn.wordpress.org/branches/4.9@42168
git-svn-id: http://core.svn.wordpress.org/branches/4.9@41998 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2017-11-13 22:44:24 +00:00
Dominik Schilling
062ab0b0c8
Revert [42166].
...
Due to running `npm install` an updated `npm-shrinkwrap.json` file was committed.
See #42483 .
Built from https://develop.svn.wordpress.org/branches/4.9@42167
git-svn-id: http://core.svn.wordpress.org/branches/4.9@41997 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2017-11-13 22:43:42 +00:00
Weston Ruter
46c75fbaf7
I18N: Fix passing singular/plural strings to JS.
...
This is a temporary solution while waiting for full I18N support in JS.
Props ocean90, dd32, westonruter, Mirucon for testing.
Amends [41376], [41721], [41389].
See #20491 .
Fixes #42510 for 4.9.
Built from https://develop.svn.wordpress.org/branches/4.9@42164
git-svn-id: http://core.svn.wordpress.org/branches/4.9@41995 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2017-11-13 07:09:35 +00:00
Weston Ruter
11e007c502
About: Add vertical alignment for developer happiness sections.
...
Also run CSS autoprefixer to add `-ms-` prefixes for CSS grid identifiers for IE11.
Props Presskopp.
Amends [42121].
See #42087 .
Fixes #42524 for 4.9.
Built from https://develop.svn.wordpress.org/branches/4.9@42162
git-svn-id: http://core.svn.wordpress.org/branches/4.9@41993 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2017-11-13 05:49:36 +00:00
Weston Ruter
b0c557fbb2
About: Fix grammar typo with pluralization.
...
Props metodiew, westonruter.
Amends [42121].
See #42087 .
Fixes #42476 for 4.9.
Built from https://develop.svn.wordpress.org/branches/4.9@42160
git-svn-id: http://core.svn.wordpress.org/branches/4.9@41991 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2017-11-13 05:20:36 +00:00
Weston Ruter
277261edeb
About: Synchronize 4.9 tagline across about pages for credits, freedoms, and privacy.
...
Props dave.pullig.
Amends [41943].
See #42087 .
Fixes #42518 for 4.9.
Built from https://develop.svn.wordpress.org/branches/4.9@42158
git-svn-id: http://core.svn.wordpress.org/branches/4.9@41989 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2017-11-12 20:00:37 +00:00
Weston Ruter
1b39843b11
Theme Editor: Fix styling of child theme notice.
...
Props westonruter, melchoyce, ndiego.
See #24048 .
Fixes #42491 for 4.9.
Built from https://develop.svn.wordpress.org/branches/4.9@42156
git-svn-id: http://core.svn.wordpress.org/branches/4.9@41987 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2017-11-11 20:44:38 +00:00
Weston Ruter
6cc5d01d17
Customize: Restore ability to add Custom Link nav menu items for jump links and other URLs that were previously allowed.
...
Simplify regular expression for checking URL validity to just do basic checks to confirm the value looks like a URL. Leave the complete validation to the server-side logic in `WP_Customize_Nav_Menu_Item_Setting::sanitize()` to avoid having to maintain two separate codebases for validating URLs.
Props westonruter, SergeyBiryukov for testing.
Amends [41697].
See #32816 .
Fixes #42506 for 4.9.
Built from https://develop.svn.wordpress.org/branches/4.9@42154
git-svn-id: http://core.svn.wordpress.org/branches/4.9@41985 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2017-11-10 23:43:39 +00:00
Weston Ruter
523fcaca2e
Customize: Ensure customization drafts are published instead of trashed when scheduled changeset goes live while non-admin user is authenticated (such as during WP Cron).
...
Props designsimply for testing, dlh for testing, melchoyce for testing.
See #28721 , #34923 , #42220 .
Fixes #42489 for 4.9.
Built from https://develop.svn.wordpress.org/branches/4.9@42149
git-svn-id: http://core.svn.wordpress.org/branches/4.9@41980 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2017-11-10 22:45:38 +00:00
Weston Ruter
a647fbead2
Settings: Replace `count()` call with `empty()` in `get_settings_errors()` to prevent PHP 7.2 warnings when `$wp_settings_errors` is `null`.
...
Props pross, dd32, westonruter.
See #40109 .
Fixes #42498 for 4.9.
Built from https://develop.svn.wordpress.org/branches/4.9@42147
git-svn-id: http://core.svn.wordpress.org/branches/4.9@41978 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2017-11-10 22:32:47 +00:00
Weston Ruter
389166f9aa
Customize: Ensure autosave revision is dismissed immediately after implicit restoration notice dismissal as done with explicit notice dismissal.
...
Fixes issue where a drafted/scheduled changeset could inadvertently re-use the previous autosave revision in the preview while a user expects it to have been dismissed.
See #39896 , [41597].
Fixes #42502 for 4.9.
Built from https://develop.svn.wordpress.org/branches/4.9@42145
git-svn-id: http://core.svn.wordpress.org/branches/4.9@41976 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2017-11-10 21:45:38 +00:00
Weston Ruter
af74789be0
Widgets: Style the Image Widget's link field as invalid when a bad URL is supplied.
...
Fixes issue where user may supply an invalid URL and be unable to save the widget on the Widgets admin screen without being told why.
Amends [41252].
See #41274 .
Fixes #42488 for 4.9.
Built from https://develop.svn.wordpress.org/branches/4.9@42141
git-svn-id: http://core.svn.wordpress.org/branches/4.9@41972 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2017-11-10 01:29:40 +00:00
Weston Ruter
ca12fb6710
Customize: Fix reliability of just-in-time publishing for changesets that miss their schedule when visiting `customize.php`.
...
When just doing `wp_publish_post()` for the changeset from `customize.php`, any option-based settings will fail to get saved because `WP_Customize_Manager` would have already been loaded with `settings_previewed`, resulting in `update_option()` calls being short-circuited. So an admin-ajax request to `customize_save` is used to work around this.
Props westonruter, jeremyfelt, dlh for testing, LittleBigThing for testing.
Amends [41626].
See #28721 , #39221 .
Fixes #42457 for 4.9.
Built from https://develop.svn.wordpress.org/branches/4.9@42139
git-svn-id: http://core.svn.wordpress.org/branches/4.9@41970 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2017-11-09 04:45:38 +00:00
Weston Ruter
707a3196f7
Customize: Ensure `autosaving` message gets sent to preview after initial change when `saved` state is first dirty.
...
Amends [41667].
Fixes #42475 for 4.9.
Built from https://develop.svn.wordpress.org/branches/4.9@42137
git-svn-id: http://core.svn.wordpress.org/branches/4.9@41968 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2017-11-09 04:21:40 +00:00
Weston Ruter
e6a91f7ccf
Settings: Fix date/time format previewing.
...
Props afercia.
Amends [41857].
Fixes #41603 for 4.9.
Built from https://develop.svn.wordpress.org/branches/4.9@42135
git-svn-id: http://core.svn.wordpress.org/branches/4.9@41966 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2017-11-09 03:57:36 +00:00
Weston Ruter
bbef4fd178
Customize: Restore search icon to available widgets pane incorrectly removed in [41893].
...
See #42215 .
Fixes #42472 for 4.9.
Built from https://develop.svn.wordpress.org/branches/4.9@42133
git-svn-id: http://core.svn.wordpress.org/branches/4.9@41964 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2017-11-09 01:06:34 +00:00
Weston Ruter
fcb3e4d712
Branch 4.9
...
Built from https://develop.svn.wordpress.org/branches/4.9@42126
git-svn-id: http://core.svn.wordpress.org/branches/4.9@41957 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2017-11-07 05:41:11 +00:00
Weston Ruter
59fdb7a220
Post WordPress 4.9 RC2 bump.
...
Built from https://develop.svn.wordpress.org/trunk@42125
git-svn-id: http://core.svn.wordpress.org/trunk@41956 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2017-11-07 05:26:47 +00:00
Weston Ruter
f76b491135
WordPress 4.9 RC2.
...
Built from https://develop.svn.wordpress.org/trunk@42124
git-svn-id: http://core.svn.wordpress.org/trunk@41955 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2017-11-07 04:54:47 +00:00
Konstantin Obenland
4eda9c7388
About: Hardcoded image sources.
...
We're committed to these images now.
See #42087 .
Built from https://develop.svn.wordpress.org/trunk@42123
git-svn-id: http://core.svn.wordpress.org/trunk@41954 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2017-11-07 04:26:48 +00:00
Weston Ruter
e4fe01e2b4
Customize: Fix logic inversion in [42113] which prevented themes from being installed in Customizer.
...
Also fix PHP notice related to parent themes and WordPress.org theme query results.
Props dd32, obenland, celloexpressions, westonruter, atachibana for testing.
See #42406 , #37661 .
Fixes #42442 .
Built from https://develop.svn.wordpress.org/trunk@42122
git-svn-id: http://core.svn.wordpress.org/trunk@41953 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2017-11-07 04:17:47 +00:00
Mel Choyce
2382232692
About Page: Implement design.
...
Props ryelle, karmatosed, transl8or, obenland, melchoyce.
See #42087 .
Built from https://develop.svn.wordpress.org/trunk@42121
git-svn-id: http://core.svn.wordpress.org/trunk@41952 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2017-11-07 04:11:47 +00:00
Dion Hulse
f71a087b41
Bump Akismet external to 4.0.1.
...
git-svn-id: http://core.svn.wordpress.org/trunk@41950 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2017-11-07 03:10:03 +00:00
Gary Pendergast
8255d04abb
WPDB: Check that `AUTH_SALT` is not empty.
...
In `wpdb::placeholder_escape()`, the key for `hash_hmac()` defaults to `AUTH_SALT`, but `hash_hmac()` will return an empty string if the key is empty.
This had the side effect of the string `{}` being incorrectly replaced with a `%` character in queries just about to be run on the database.
Props jsonfry.
Fixes #42431 .
Built from https://develop.svn.wordpress.org/trunk@42120
git-svn-id: http://core.svn.wordpress.org/trunk@41949 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2017-11-07 01:09:47 +00:00
Gary Pendergast
002d65112f
WPDB: Fix a PHP notice when `AUTH_SALT` is undefined.
...
In `wpdb::placeholder_escape()`, the key for `hash_hmac()` falls back to `rand()` when `AUTH_SALT` is undefined. `hash_hmac()` requires the key to be a string, however, so we need to cast it as such.
Props mkomar.
Fixes #42401 .
Built from https://develop.svn.wordpress.org/trunk@42119
git-svn-id: http://core.svn.wordpress.org/trunk@41948 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2017-11-07 00:30:46 +00:00
Weston Ruter
a74afff787
Customize: Prevent `customize_autosaved=on` from getting added to frontend preview URLs.
...
Amends [41969].
See #39896 , #42450 .
Fixes #42433 .
Built from https://develop.svn.wordpress.org/trunk@42118
git-svn-id: http://core.svn.wordpress.org/trunk@41947 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2017-11-06 23:11:53 +00:00
Weston Ruter
c15b2a0908
Customize: Fall back to ISO date format for date/time control inputs if year, month, or day are missing from the `date_format` option.
...
Amends [42111].
Props dlh, westonruter.
Fixes #42394 .
Built from https://develop.svn.wordpress.org/trunk@42117
git-svn-id: http://core.svn.wordpress.org/trunk@41946 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2017-11-06 20:28:48 +00:00
John Blackbourn
b8de3548d3
Administration: Ensure the new Privacy Policy screen appears when within the Network Admin and User Admin.
...
Props hnle, dd32
Fixes #42443
Built from https://develop.svn.wordpress.org/trunk@42116
git-svn-id: http://core.svn.wordpress.org/trunk@41945 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2017-11-06 18:17:54 +00:00
Konstantin Obenland
65c1468ff5
File Editors: Account for network admin use
...
Fixes a bug where files couldn't be accessed in multisite installs.
Props flixos90, westonruter.
Fixes #42420 .
Built from https://develop.svn.wordpress.org/trunk@42115
git-svn-id: http://core.svn.wordpress.org/trunk@41944 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2017-11-03 18:51:49 +00:00
Weston Ruter
76e01c3562
Customize: Ensure `changeset_uuid` param for autosave auto-draft gets stripped from location after previewing theme switch when not in branching mode.
...
Amends [41597].
See #39896 .
Fixes #42415 .
Built from https://develop.svn.wordpress.org/trunk@42114
git-svn-id: http://core.svn.wordpress.org/trunk@41943 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2017-11-03 17:37:52 +00:00
Weston Ruter
d0608c5585
Customize: Make sure theme switch blocking in the Customizer is consistently applied when changeset is drafted/scheduled.
...
* Consider both `selectedChangesetStatus` and `changesetStatus` states when deciding to disable.
* Factor out common logic into `canSwitchTheme` function on `ThemesPanel`.
* Keep Live Preview and Install buttons disabled in Themes controls and detail overlays when appropriate.
Props westonruter, dlh.
Amends [41788].
See #42126 , #37661 , #39896 .
Fixes #42406 .
Built from https://develop.svn.wordpress.org/trunk@42113
git-svn-id: http://core.svn.wordpress.org/trunk@41942 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2017-11-03 00:59:47 +00:00
Weston Ruter
83c29a4d08
Theme Editor: Ensure files listed recursively can be both viewed and edited.
...
Prevent edits to 2-level deep theme files from returning a `disallowed_theme_file` error when attempting to save an edit. Aligns logic for gathering `$allowed_files` in `theme-editor.php` for listing files with the validation logic in `wp_edit_theme_plugin_file()`.
Amends [41806].
See #6531 .
Fixes #42425 .
Built from https://develop.svn.wordpress.org/trunk@42112
git-svn-id: http://core.svn.wordpress.org/trunk@41941 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2017-11-02 23:05:48 +00:00
Weston Ruter
ef272167c4
Customize: Present the date/time control input fields in the same format (and order) as `date_format`.
...
Props westonruter, obenland, atachibana for testing, Mirucon for testing.
See #42373 , #28721 .
Fixes #42394 .
Built from https://develop.svn.wordpress.org/trunk@42111
git-svn-id: http://core.svn.wordpress.org/trunk@41940 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2017-11-02 23:00:49 +00:00
Konstantin Obenland
99c19a5a82
Codemirror: Unify line endings in csslint.js
...
This is likely a problem caused upstream and will probably be a non-issue once #41870 is merged in a future release.
Fixes #42424 .
Built from https://develop.svn.wordpress.org/trunk@42110
git-svn-id: http://core.svn.wordpress.org/trunk@41939 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2017-11-02 22:31:47 +00:00
Weston Ruter
8902ddba18
Customize: Always use underlying changeset post date as initial date in scheduled date fields if date is future.
...
Prevent user from having to re-enter the previously-supplied future date if they had switched from schedule to draft but wanted to switch back again. Improves parity with behavior of post edit screen.
Props dlh, westonruter, obenland.
See #39896 , #28721 .
Fixes #42413 .
Built from https://develop.svn.wordpress.org/trunk@42109
git-svn-id: http://core.svn.wordpress.org/trunk@41938 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2017-11-02 20:00:48 +00:00
Weston Ruter
fbee634ac7
Customize: Prevent `history.replaceState()` and `history.pushState()` calls from causing error in customize preview before DOM ready.
...
Amends [41597].
See #39896 .
Fixes #42414 .
Built from https://develop.svn.wordpress.org/trunk@42108
git-svn-id: http://core.svn.wordpress.org/trunk@41937 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2017-11-02 19:27:47 +00:00
Weston Ruter
5f16c57782
Customize: Prevent re-importing starter content when changeset is saved as draft or scheduled.
...
Themes cannot currently be switched in Customizer after changeset is saved anyway.
Props dlh, westonruter.
See #40146 , #42411 , #42126 .
Fixes #42395 .
Built from https://develop.svn.wordpress.org/trunk@42107
git-svn-id: http://core.svn.wordpress.org/trunk@41936 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2017-11-02 19:00:54 +00:00