Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-12-25 10:38:11 +01:00
Code Issues Projects Releases Wiki Activity
37,974 Commits 50 Branches 749 Tags 806 MiB
9226691b3c
Commit Graph

25187 Commits

Author SHA1 Message Date
Sergey Biryukov
9226691b3c Docs: Remove erroneous @static notation from WP_Tax_Query::get_sql(), added in [32627]. 
The method was never used as static.

Props birgire.
See #42803.
Built from https://develop.svn.wordpress.org/trunk@42752


git-svn-id: http://core.svn.wordpress.org/trunk@42582 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2018-02-25 21:45:30 +00:00
Sergey Biryukov
0b45a1e5fa Docs: Remove erroneous @static notation from WP_Http::_dispatch_request(), added in [32650]. 
The method was never user as static.

Props birgire.
See #42803.
Built from https://develop.svn.wordpress.org/trunk@42751


git-svn-id: http://core.svn.wordpress.org/trunk@42581 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2018-02-25 21:35:30 +00:00
Sergey Biryukov
bd9cdde1eb Docs: Remove duplicated DocBlock for http_response hook in WP_Http::_dispatch_request(). 
The filter is already documented in `WP_Http::request()`.

See #42505.
Built from https://develop.svn.wordpress.org/trunk@42750


git-svn-id: http://core.svn.wordpress.org/trunk@42580 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2018-02-25 21:32:30 +00:00
Sergey Biryukov
510feac5bb Twenty Fourteen: Remove redundant @access and @static notations from classes. 
Props birgire.
See #41452, #42803, #42505.
Built from https://develop.svn.wordpress.org/trunk@42749


git-svn-id: http://core.svn.wordpress.org/trunk@42579 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2018-02-25 20:49:30 +00:00
Sergey Biryukov
c3738e9617 Docs: Remove @access notation from WP_Taxonomy::$meta_box_sanitize_cb. 
See #42505, #41452.
Built from https://develop.svn.wordpress.org/trunk@42748


git-svn-id: http://core.svn.wordpress.org/trunk@42578 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2018-02-25 20:38:30 +00:00
Sergey Biryukov
b026fde152 Docs: Remove @static notations from property DocBlocks in wp-admin/* and wp-includes/* classes. 
This tag has been used in the past, but should no longer be used. Just using the `static` keyword in code is enough for PhpDocumentor on PHP5+ to recognize static variables and methods, and PhpDocumentor will mark them as static.

Props birgire.
See #42803.
Built from https://develop.svn.wordpress.org/trunk@42747


git-svn-id: http://core.svn.wordpress.org/trunk@42577 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2018-02-25 20:32:30 +00:00
Sergey Biryukov
08227812a0 Docs: Remove @static notations from method DocBlocks in wp-includes/* classes. 
This tag has been used in the past, but should no longer be used. Just using the `static` keyword in code is enough for PhpDocumentor on PHP5+ to recognize static variables and methods, and PhpDocumentor will mark them as static.

Props birgire.
See #42803.
Built from https://develop.svn.wordpress.org/trunk@42746


git-svn-id: http://core.svn.wordpress.org/trunk@42576 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2018-02-25 20:22:30 +00:00
Sergey Biryukov
0fea564b7d Docs: Remove @static notations from method DocBlocks in wp-admin/* classes. 
This tag has been used in the past, but should no longer be used. Just using the `static` keyword in code is enough for PhpDocumentor on PHP5+ to recognize static variables and methods, and PhpDocumentor will mark them as static.

Props birgire.
See #42803.
Built from https://develop.svn.wordpress.org/trunk@42745


git-svn-id: http://core.svn.wordpress.org/trunk@42575 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2018-02-25 20:06:30 +00:00
Adam Silverstein
de6906a045 Customizer: in menus, reset results when closing the 'add items' panel. 
Trigger a keyup event when clearing the search field in response to closing the add item panel. The keyup event triggers a search and resets the results. Previously, the search field was cleared while the potentially blank search results were left in place making it impossible to select new menu items.

Props Blair jersyer, aranwer104, afercia.
Fixes #43333.


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


git-svn-id: http://core.svn.wordpress.org/trunk@42574 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2018-02-25 18:48:29 +00:00
Sergey Biryukov
b34b1ee061 Tests: Correct a "false positive" assertion in test_media_handle_upload_ignores_page_parent_for_directory_date(). 
Props birgire.
Fixes #42736.
Built from https://develop.svn.wordpress.org/trunk@42743


git-svn-id: http://core.svn.wordpress.org/trunk@42573 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2018-02-25 18:47:30 +00:00
Sergey Biryukov
61e8101442 Tests: Avoid hardcoded domain name in test_media_handle_upload_uses_post_parent_for_directory_date(). 
Props birgire.
See #42736.
Built from https://develop.svn.wordpress.org/trunk@42742


git-svn-id: http://core.svn.wordpress.org/trunk@42572 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2018-02-25 18:43:30 +00:00
Adam Silverstein
89c9e27fd1 Unit Tests: add a DIR_TESTROOT constant to avoid relative paths. 
Fix an issue that prevents tests from running correctly when run outside their normal context.

Props PressLabs, johnbillion.
Fixes #40071.


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


git-svn-id: http://core.svn.wordpress.org/trunk@42571 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2018-02-25 18:07:31 +00:00
Adam Silverstein
a299c5c344 Fix eshint error since r42739. 
Remove a trailing comma in [42739] that was throing a jshint error.


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


git-svn-id: http://core.svn.wordpress.org/trunk@42570 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2018-02-25 16:49:30 +00:00
Adam Silverstein
da89d20c39 Media: grid view - correct placeholder positioning during uploads. 
Preventing contextually created attachments from being added to the grid collection in Attachments.validator. Remove the previous filtering introduced in [41937] which caused the placement issue.

Props lancewillett, Junaidkbr, designsimply, joemcgill.
Fixes #42968.

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


git-svn-id: http://core.svn.wordpress.org/trunk@42569 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2018-02-25 16:41:31 +00:00
Sergey Biryukov
4d47bfce41 Coding Standards: Fix code indent in unescape_invalid_shortcodes(). 
Props joelcj91, GaryJ.
Fixes #43346.
Built from https://develop.svn.wordpress.org/trunk@42738


git-svn-id: http://core.svn.wordpress.org/trunk@42568 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2018-02-25 16:36:30 +00:00
Adam Silverstein
505c2ddb61 Taxonomy: restore TagSearch unit tests and correct deprecated version string. 
Reverts unit test removal, instead changing them to expect the function to be deprecated.
Correct the version the ajax callback was deprecated.

Amends [42614].

Props dlh, ocean90.
Fixes #38922.


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


git-svn-id: http://core.svn.wordpress.org/trunk@42567 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2018-02-25 16:28:30 +00:00
Sergey Biryukov
395667f916 Comments: After [42703], make sure $args['type'] in paginate_comments_links() is always defined. 
Props anantajitjg.
Fixes #43299.
Built from https://develop.svn.wordpress.org/trunk@42736


git-svn-id: http://core.svn.wordpress.org/trunk@42566 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2018-02-25 16:08:30 +00:00
Sergey Biryukov
35d5163d66 Docs: Correct description for WP_User::get_role_caps(). 
Props thomaswm.
Fixes #43410.
Built from https://develop.svn.wordpress.org/trunk@42735


git-svn-id: http://core.svn.wordpress.org/trunk@42565 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2018-02-25 15:39:30 +00:00
Sergey Biryukov
b6229650e0 Themes: Pre-translate theme names on Themes screen before sorting the array, to improve performance and avoid a warning in PHP 5.x. 
Props bobbingwide, sebastian.pisula.
Fixes #34565.
Built from https://develop.svn.wordpress.org/trunk@42734


git-svn-id: http://core.svn.wordpress.org/trunk@42564 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2018-02-25 13:18:30 +00:00
Sergey Biryukov
b12620e798 Build/Test Tools: Remove vendor file name entry from .gitignore. 
Props netweb.
Fixes #43411.
Built from https://develop.svn.wordpress.org/trunk@42733


git-svn-id: http://core.svn.wordpress.org/trunk@42563 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2018-02-25 11:30:32 +00:00
Sergey Biryukov
0e39cef343 Menus: When checking if a Custom Link matches the current URL to add the current-menu-item class, check for decoded URL as well. 
Props soulseekah, campusboy1987.
Fixes #43401.
Built from https://develop.svn.wordpress.org/trunk@42732


git-svn-id: http://core.svn.wordpress.org/trunk@42562 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2018-02-24 13:44:31 +00:00
Sergey Biryukov
fc5617e7fe Administration: Use HTTPS for dashboard_primary_feed URL. 
`dashboard_secondary_feed` is already using HTTPS since [29787].

Props iandunn.
Fixes #40416.
Built from https://develop.svn.wordpress.org/trunk@42731


git-svn-id: http://core.svn.wordpress.org/trunk@42561 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2018-02-24 09:30:33 +00:00
Gary Pendergast
cf49eacd62 REST API: Translate the taxonomy visibility description strings. 
This was missed in [42729].

Props TimothyBlynJacobs.
Fixes #42707.


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


git-svn-id: http://core.svn.wordpress.org/trunk@42560 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2018-02-22 00:59:30 +00:00
Gary Pendergast
d6923d285c REST API: Show taxonomy visibility settings. 
For Gutenberg and other admin-type interfaces, it's useful to be able to see the visibility settings for taxonomies.

Props joehoyle, pento.
Fixes #42707.


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


git-svn-id: http://core.svn.wordpress.org/trunk@42559 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2018-02-22 00:24:31 +00:00
Aaron Jorbin
f4f64377b7 Community Events Dashboard: Use wp_list_pluck rather than array_columns 
array_columns is only available in PHP 5.5+

Introduced in [42726]

See: #41112.


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


git-svn-id: http://core.svn.wordpress.org/trunk@42558 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2018-02-21 23:27:31 +00:00
Andrea Fercia
54a45f6d77 Accessibility: Change the terms "Quick Edit" link to a button. 
For better accessibility and semantics, user interface controls that perform an
action should be buttons. Links should exclusively be used for navigation.
See #38677 / [42725].

Fixes #43382.

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


git-svn-id: http://core.svn.wordpress.org/trunk@42557 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2018-02-21 23:04:31 +00:00
Aaron Jorbin
9f8d1ab69d Community Events Dashboard: Always show a WordCamp if one is coming up 
WordCamps are celebrations of the local WordPress Community and once a local one is scheduled, people in that community should know it is coming. This adjusts the WordPress Events in the dashboard widgets to always display a WordCamp, even if there are multiple Meetups happening first.

Props iandunn, metalandcoffee, warmlaundry, alejandroxlopez, jorbin.
Fixes #41112.


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


git-svn-id: http://core.svn.wordpress.org/trunk@42556 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2018-02-21 23:01:31 +00:00
Andrea Fercia
4767e7736c Accessibility: Change the posts "Quick Edit" link to a button. 
For better accessibility and semantics, user interface controls that perform an
action should be buttons. Links should exclusively be used for navigation. Also,
adds an `aria-expanded` attribute to the button to communicate to assistive
technologies the expanded / collapsed status of the Quick Edit form.

Props Cheffheid, audrasjb, afercia.
Fixes #38677.

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


git-svn-id: http://core.svn.wordpress.org/trunk@42555 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2018-02-21 22:31:32 +00:00
Sergey Biryukov
ebeb2bcf5b Tests: Replace use of $this->server with rest_get_server() for better memory recycling. 
Props danielbachhuber.
Fixes #41641.
Built from https://develop.svn.wordpress.org/trunk@42724


git-svn-id: http://core.svn.wordpress.org/trunk@42554 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2018-02-21 16:25:31 +00:00
Mark Jaquith
edfe2ece51 Cache API: Allow external object caches to gracefully degrade to the default object cache. 
Rework logic for how external object caches are detected, so that if
an external cache does not define a `wp_cache_init()`, the built-in
object cache will be used.

Object caches can now wrap their entire contents in logic checks. So a
Redis caching backend could make sure that the `Redis` PHP class is
available before defining all the caching functions. And if Redis is
not available, the site doesn't break or throw errors or think it is
using caching when it isn't. This is particularly useful for doing
local development, where you might want to develop on a site without
running Memcache or Redis like you are in production.

* Accounts for multisite, which may re-initialize the object cache
multiple times.
* Accounts for object caches that may include `object-cache.php` during
`advanced-cache.php` (before WP loads it).

Props jtsternberg, markjaquith.
Fixes #22661.


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


git-svn-id: http://core.svn.wordpress.org/trunk@42553 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2018-02-21 14:59:30 +00:00
Sergey Biryukov
c7c98dd7ea Docs: Correct $id parameter type for old_slug_redirect_post_id filter. 
Props dlh.
Fixes #43375.
Built from https://develop.svn.wordpress.org/trunk@42722


git-svn-id: http://core.svn.wordpress.org/trunk@42552 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2018-02-21 09:35:33 +00:00
Sergey Biryukov
9e5e5ecdc6 Docs: Add a reference to get_pages() arguments in wp_dropdown_pages() and wp_list_pages(), as they both use the function internally. 
Props birgire.
Fixes #43355.
Built from https://develop.svn.wordpress.org/trunk@42721


git-svn-id: http://core.svn.wordpress.org/trunk@42549 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2018-02-19 22:24:31 +00:00
Sergey Biryukov
dcf5eb07de Docs: Correct documentation for Heartbeat filters. 
`$response` parameter is documented as an array or object, but only array is actually supported.

See #42777, #42505.
Built from https://develop.svn.wordpress.org/trunk@42720


git-svn-id: http://core.svn.wordpress.org/trunk@42548 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2018-02-19 21:46:33 +00:00
Peter Wilson
e6ccdf161f General: Further improve error messages following [42648]. 
Props kristastevens, melchoyce.
Fixes #38332 for trunk.


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


git-svn-id: http://core.svn.wordpress.org/trunk@42547 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2018-02-19 02:13:32 +00:00
Dominik Schilling
5eddf9a359 I18N: Remove unused $start_of_week property from WP_Locale. 
Missed in [35685], see #28344.

Props birgire, tonybogdanov.
Fixes #43344.
Built from https://develop.svn.wordpress.org/trunk@42718


git-svn-id: http://core.svn.wordpress.org/trunk@42546 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2018-02-18 16:32:34 +00:00
Konstantin Obenland
3f7a8aac6b Docs: Add filter docs for wp_refresh_nonces 
Props chetan200891, slushman, dlh, netweb.
Fixes #42777.


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


git-svn-id: http://core.svn.wordpress.org/trunk@42545 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2018-02-17 04:42:33 +00:00
Sergey Biryukov
e50b9c943f Database: If both WP_DEBUG and WP_DEBUG_DISPLAY are true, display a more specific error message in wpdb::bail(). 
Props sivel, Mte90, SergeyBiryukov.
Fixes #13657.
Built from https://develop.svn.wordpress.org/trunk@42716


git-svn-id: http://core.svn.wordpress.org/trunk@42544 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2018-02-15 14:29:30 +00:00
atimmer
e17e29d4ea Docs: Improve JSDoc for for wp-admin/js/xfn.js. 
Props kapteinbluf, igorsch.
Fixes #43204.

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


git-svn-id: http://core.svn.wordpress.org/trunk@42543 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2018-02-15 13:35:31 +00:00
atimmer
34c6523a0d Docs: Improve JSDoc for wp-admin/js/user-suggest.js. 
Amend r42708 by fixing the 80 character wrap around.

Props timhavinga.
See #43270.

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


git-svn-id: http://core.svn.wordpress.org/trunk@42542 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2018-02-15 13:26:33 +00:00
Sergey Biryukov
7d2cd516d1 Twenty Seventeen: Underline links in comments. 
Props jainnidhi, larrach, audrasjb.
Fixes #43317. 
Built from https://develop.svn.wordpress.org/trunk@42713


git-svn-id: http://core.svn.wordpress.org/trunk@42541 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2018-02-15 03:34:30 +00:00
Sergey Biryukov
5d1e06f939 Docs: Move inline comments in wp_kses_split2() before the blocks they apply to. 
See #42505.
Built from https://develop.svn.wordpress.org/trunk@42712


git-svn-id: http://core.svn.wordpress.org/trunk@42540 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2018-02-14 11:46:33 +00:00
Sergey Biryukov
d9f222f740 Customize: Correct closing tags in customize_themes_print_templates(). 
Props johnpgreen, nandorsky.
Fixes #43307.
Built from https://develop.svn.wordpress.org/trunk@42711


git-svn-id: http://core.svn.wordpress.org/trunk@42539 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2018-02-13 22:15:32 +00:00
Drew Jaynes
6e665d1f15 Docs: Link to the "Conditional Tags" article in the Theme Developer Handbook from the descriptions for a variety of core conditional tag functions. 
These notations largely serve to direct consumers (of both the source and the parsed code reference) to extended information on individual and related conditional tags throughout WordPress. The changeset also standardizes corresponding DocBlock summaries to use third-person singular verbs.

Notations been added for the following functions:

* comments_open()
* email exists()
* has_excerpt()
* has_post_thumbnail()
* has_tag()
* in_category()
* in_the_loop()
* is_404()
* is_active_sidebar()
* is_active_widget()
* is_admin()
* is_admin_bar_showing()
* is_archive()
* is_attachment()
* is_author()
* is_blog_installed()
* is_category()
* is_comments_popup()
* is_date()
* is_day()
* is_dynamic_sidebar()
* is_feed()
* is_front_page()
* is_home()
* is_local_attachment()
* is_main_query
* is_month()
* is_multi_author
* is_new_day()
* is_page()
* is_page_template()
* is_paged()
* is_plugin_active()
* is_plugin_active_for_network()
* is_plugin_inactive()
* is_plugin_page()
* is_post_type_archive()
* is_preview()
* is_rtl()
* is_search()
* is_single()
* is_singular()
* is_sticky()
* is_tag()
* is_tax()
* is_taxonomy_hierarchical()
* is_time()
* is_trackback()
* is_user_logged_in()
* is_year()
* pings_open()
* post_type_exists()
* taxonomy_exists()
* term_exists()
* username exists()
* wp_attachment_is_image()
* wp_script_is()

Props janalwin.
Fixes #43254.

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


git-svn-id: http://core.svn.wordpress.org/trunk@42538 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2018-02-13 16:54:31 +00:00
atimmer
5e190dc084 Docs: Improve JSDoc for media/views/spinner.js. 
Amends r42675 - includes the built media files.

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


git-svn-id: http://core.svn.wordpress.org/trunk@42537 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2018-02-13 15:45:30 +00:00
atimmer
87130f0e20 Docs: Improve JSDoc for wp-admin/js/user-suggest.js. 
Props timhavinga.
Fixes #43270.

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


git-svn-id: http://core.svn.wordpress.org/trunk@42536 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2018-02-13 15:38:31 +00:00
Sergey Biryukov
68a3e7745a Docs: Add documentation for header_video_settings filter. 
Props milana_cap.
Fixes #43300.
Built from https://develop.svn.wordpress.org/trunk@42707


git-svn-id: http://core.svn.wordpress.org/trunk@42535 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2018-02-12 22:39:31 +00:00
Sergey Biryukov
dfa6839706 Media: In img_caption_shortcode(), make sure $id and $caption_id are always defined. 
See #34595.
Built from https://develop.svn.wordpress.org/trunk@42706


git-svn-id: http://core.svn.wordpress.org/trunk@42534 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2018-02-12 22:36:33 +00:00
Sergey Biryukov
0306b3f637 Docs: Use code formatting for tags in img_caption_shortcode() DocBlock. 
See #34595.
Built from https://develop.svn.wordpress.org/trunk@42705


git-svn-id: http://core.svn.wordpress.org/trunk@42533 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2018-02-12 21:40:31 +00:00
Sergey Biryukov
0f8d7de77d Media: Pass original attribute values to img_caption_shortcode_width filter instead of markup pieces. 
Add `caption_id` to the list of documented `[caption]` shortcode attributes.

See #34595.
Built from https://develop.svn.wordpress.org/trunk@42704


git-svn-id: http://core.svn.wordpress.org/trunk@42532 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2018-02-12 21:37:30 +00:00
Sergey Biryukov
0a97d79899 Comments: Avoid a PHP notice in paginate_comments_links() if type argument is set to array. 
The function is a wrapper for `paginate_links()`, which returns an array if requested.

Props anantajitjg.
Fixes #43299.
Built from https://develop.svn.wordpress.org/trunk@42703


git-svn-id: http://core.svn.wordpress.org/trunk@42531 1a063a9b-81f0-0310-95a4-ce76da25c4cd
 2018-02-12 21:12:35 +00:00