John Blackbourn
b84023ea33
Taxonomy: Introduce more fine grained capabilities for managing taxonomy terms.
...
This introduces the singular `edit_term`, `delete_term`, and `assign_term` meta capabilities for terms, and switches the base capability name for tags from `manage_categories` to `manage_post_tags` and the corresponding `edit_post_tags`, `delete_post_tags`, and `assign_post_tags`.
All of these capabilities ultimately map to `manage_categories` so by default there is no change in the behaviour of the capabilities for categories, tags, or custom taxonomies. The `map_meta_cap` filter and the `capabilities` argument when registering a taxonomy now allow for control over editing, deleting, and assigning individual terms, as well as a separation of capabilities for tags from those of categories.
Fixes #35614
Props johnjamesjacoby for feedback
Built from https://develop.svn.wordpress.org/trunk@38698
git-svn-id: http://core.svn.wordpress.org/trunk@38641 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-09-30 22:40:28 +00:00
Sergey Biryukov
ee109482db
Text Changes: Unify two more permission error messages.
...
Props ramiy.
Fixes #38158 . See #34521 .
Built from https://develop.svn.wordpress.org/trunk@38666
git-svn-id: http://core.svn.wordpress.org/trunk@38609 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-09-28 00:17:28 +00:00
Joe McGill
8f36a570cb
Media: Make media library searchable by filename.
...
This applies a new private function, `_filter_query_attachment_filenames()`,
to the `post_clauses` filter hook during `wp_ajax_query_attachments()` and
`wp_edit_attachments_query_vars()` to include `_wp_attached_file` post meta
in search queries performed from the media library or in a `WP_Media_List_Table`.
Props wonderboymusic, DrewAPicture, joemcgill, swissspidy.
Fixes #22744 .
Built from https://develop.svn.wordpress.org/trunk@38625
git-svn-id: http://core.svn.wordpress.org/trunk@38568 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-09-20 01:45:31 +00:00
John Blackbourn
69c152cee7
Taxonomy: Correct the function description for `wp_ajax_add_link_category()`.
...
See #37770
Built from https://develop.svn.wordpress.org/trunk@38490
git-svn-id: http://core.svn.wordpress.org/trunk@38431 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-09-01 00:49:29 +00:00
Scott Taylor
a3ffebce30
Bootstrap: do not go gentle into that good night r38411, r38412, and parts of r38389.
...
See #36335 .
Built from https://develop.svn.wordpress.org/trunk@38470
git-svn-id: http://core.svn.wordpress.org/trunk@38411 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-08-31 16:31:29 +00:00
Scott Taylor
0419d1e318
Press This: in `wp_ajax_press_this_save_post()` and `wp_ajax_press_this_add_category()`, don't check for a global instance. `WP_Press_This` is a Controller, but not really a Singleton. This also keeps it from being a pluggable class, which it is right now.
...
See #37699 .
Built from https://develop.svn.wordpress.org/trunk@38465
git-svn-id: http://core.svn.wordpress.org/trunk@38406 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-08-31 06:25:29 +00:00
Scott Taylor
5d94d97b29
List Tables: AJAX actions for List Tables do not need to declare `global $wp_list_table`. List tables on admin screens are in global scope, and they contain hooks that don't pass the the list table as context, hence using globals there so that functions can import them. That problem does not exist in the AJAX actions, which are virtually impossible to hook into as is.
...
See #37699 .
Built from https://develop.svn.wordpress.org/trunk@38455
git-svn-id: http://core.svn.wordpress.org/trunk@38396 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-08-30 20:07:29 +00:00
Scott Taylor
390ceba6c7
Bootstrap: after r38409 and r38410, revert r38402 which reverted r38399.
...
This fixes the paths in `wp-vendor/` that were including `src`. I want to drop this in so we can find out what else will break.
See #36335 .
Built from https://develop.svn.wordpress.org/trunk@38411
git-svn-id: http://core.svn.wordpress.org/trunk@38352 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-08-27 22:32:37 +00:00
Dion Hulse
0e31a46161
Bootstrap: Revert [38399] as it's broken `/build/` and subsequently core.svn.wordpress.org.
...
The generated classmaps reference `/src/` files and operates in the assumption that the base directory is one level above `wp-settings.php`, which it isn't after our build processes are run.
See #36335
Built from https://develop.svn.wordpress.org/trunk@38402
git-svn-id: http://core.svn.wordpress.org/trunk@38343 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-08-27 14:37:32 +00:00
Scott Taylor
6a529648cf
Bootstrap: Autoload classes using a Composer-generated PHP 5.2-compatible Autoloader.
...
* `wp-admin` and `wp-includes` are scanned for classes to autoload
* Several 3rd-party and Ryan McCue-shaped libraries are excluded when the classmap is generated, see `composer.json`: `autoload.exclude-from-classmap`
* `wp-vendor/autoload_52.php` is included at the top of `wp-settings.php` - no changes need to be made to unit tests to include the autoloader
* An avalanche of `require()` and `require_once()` calls that loaded class files have been removed from the codebase.
The following files have been added to `svn:ignore` - they are not 5.2-compatible and fail during pre-commit:
* src/wp-vendor/autoload.php
* src/wp-vendor/composer/autoload_real.php
* src/wp-vendor/composer/autoload_static.php
* src/wp-vendor/composer/ClassLoader.php
We favor these files instead:
* src/wp-vendor/autoload_52.php
* src/wp-vendor/composer/autoload_real_52.php
* src/wp-vendor/composer/ClassLoader52.php
When new PHP classes are added to the codebase, simply run `composer install` or `composer update` from the project root to update the autoloader.
The future is now.
See #36335 .
Built from https://develop.svn.wordpress.org/trunk@38399
git-svn-id: http://core.svn.wordpress.org/trunk@38340 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-08-27 09:15:29 +00:00
Scott Taylor
85d63f2af5
Press This: the file for the `WP_Press_This` class should not produce side effects. Similar to what we did in r38355 for `WP_Site_Icon`, drop the instances of `global` instantiation for `$wp_press_this` via loading the file. The variable can be set inline when necessary. In most of those places, if the global is already set, the file does not load and stomp it currently.
...
See #37699 .
Built from https://develop.svn.wordpress.org/trunk@38397
git-svn-id: http://core.svn.wordpress.org/trunk@38338 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-08-27 06:07:29 +00:00
Scott Taylor
9ce58d9d86
Site Icon: There is no good reason for `class-wp-site-icon.php` to drop a global instance of itself whenever the file is loaded. The lone use of the `global` instance of `WP_Site_Icon` is in an AJAX action that provides virtually no way to override - the file is loaded immediately before the `global` is used.
...
Let us remove the `$wp_site_icon` global. I will fall on the sword if this comes back to bite us (waiting with bated breath).
See #37699 .
Built from https://develop.svn.wordpress.org/trunk@38355
git-svn-id: http://core.svn.wordpress.org/trunk@38296 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-08-25 19:09:35 +00:00
Dominik Schilling
58d772a02f
Upgrade/Install: Make some install/update failures more verbose.
...
An upgrader class is used in conjunction with an upgrader skin class. A skin class handles the logging for an upgrade and informs a user about the progress and failures.
The current Ajax install/update handlers are using the `Automatic_Upgrader_Skin` class because during an Ajax request no output is intended. The difference between Ajax updates and automatic updates is that you will see the full log (usually by email) while Ajax updates focus only on success or failure. For that `Automatic_Upgrader_Skin` has one disadvantage: It doesn't provide a way to retrieve failure messages which were passed through `WP_Upgrader_Skin::error()` by the upgrader.
To solve this issue a new skin `WP_Ajax_Upgrader_Skin` has been introduced. The skin extends `Automatic_Upgrader_Skin` and overrides the `error()` and `feedback()` methods to intercept all errors, which can be a `WP_Error` object or a string.
This updates all four Ajax handler for installing/updating themes/plugins to use the new skin. They now also check the skin for any intercepted errors and pass them on to the user.
Props flixos90, obenland, ocean90.
Props DrewAPicture, pento for review.
Fixes #37531 .
Built from https://develop.svn.wordpress.org/trunk@38199
git-svn-id: http://core.svn.wordpress.org/trunk@38140 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-08-04 22:18:30 +00:00
Dominik Schilling
3105764efd
Plugins: Move capability checks further up in `wp_ajax_update_plugin()` and `wp_ajax_delete_plugin()`.
...
Add tests for both Ajax handlers.
Props Yorick Koster, swissspidy.
Fixes #37490 .
Built from https://develop.svn.wordpress.org/trunk@38168
git-svn-id: http://core.svn.wordpress.org/trunk@38109 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-07-27 17:44:41 +00:00
Dominik Schilling
e4abc1ecbf
Filesystem API: Output buffering for `request_filesystem_credentials()` should wrap the function directly.
...
Previously `ob_end_clean()` was only called when the previous condition was successful which led to unexpected results when another output buffering was involved, like PHPUnit's.
Fixes #37488 .
Built from https://develop.svn.wordpress.org/trunk@38167
git-svn-id: http://core.svn.wordpress.org/trunk@38108 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-07-27 17:11:56 +00:00
Andrew Ozz
5bccb0020d
TinyMCE, inline link:
...
- Remove proxying through WordPress to test if an URL exists.
- Fix and enhance the regex that tests if the URL is well formed.
Fixes #36638 .
Built from https://develop.svn.wordpress.org/trunk@38159
git-svn-id: http://core.svn.wordpress.org/trunk@38100 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-07-26 23:24:28 +00:00
Andrew Ozz
04319a7898
TinyMCE, link check:
...
- Use `wp.a11y.speak()` to announce bad URLs.
- Do not add a title to the link toolbar.
- Better error message.
Props afercia, azaozz.
See #36638 .
Built from https://develop.svn.wordpress.org/trunk@38126
git-svn-id: http://core.svn.wordpress.org/trunk@38067 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-07-21 03:42:34 +00:00
Dominik Schilling
868804db15
Plugins: Improve Ajax search of new plugins.
...
Fixes a few accessibility issues, restores the "Search Results" tab and the search type selector, and improves compatibility with older browsers.
Props rahulsprajapati, swissspidy, adamsilverstein, ocean90
See #37233 .
Built from https://develop.svn.wordpress.org/trunk@38119
git-svn-id: http://core.svn.wordpress.org/trunk@38060 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-07-20 16:32:31 +00:00
Joe McGill
3dbba0fff3
Post Thumbnails: Only update featured images when saving a post.
...
Previously, changing the post thumbnail of a published post in the edit screen
would immediately apply the change, rather than waiting for the post to be
saved before applying the update. This could lead to someone unintentionally
editing the post thumbnail on a published post, and made it impossible to
preview changes to post thumbnails on published posts before saving the change.
This introduces a new Ajax handler, `wp_ajax_get_post_thumbnail_html()` to
retrieve the HTML for the post thumbnail meta box without updating the post
meta value for `_thumbnail_id`. It also allows post thumbnail changes to be
previewed by passing the `_thumbnail_id` as a query variable to the preview
screen and adding a new filter, `_wp_preview_post_thumbnail_filter()`, which
gets applied to `get_post_metadata` during the post preview process.
Props flixos90.
Fixes #12922 .
Built from https://develop.svn.wordpress.org/trunk@38118
git-svn-id: http://core.svn.wordpress.org/trunk@38059 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-07-20 16:24:28 +00:00
Dominik Schilling
a320320ea0
Plugins: Use the correct admin screen when searching for plugins via Ajax.
...
Both list tables provide different actions based on where they are loaded, regular admin or network admin. Since there is only one Ajax handler for both screens we have to set the current screen before using the list tables.
Props swissspidy, ocean90.
Fixes #37373 .
Built from https://develop.svn.wordpress.org/trunk@38091
git-svn-id: http://core.svn.wordpress.org/trunk@38032 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-07-18 14:00:34 +00:00
Dominik Schilling
98d03cb738
Update/Install: Give context to some install/update strings to allow for differentiation between theme and plugin translations.
...
Props swissspidy, SergeyBiryukov.
Fixes #37290 .
Built from https://develop.svn.wordpress.org/trunk@38057
git-svn-id: http://core.svn.wordpress.org/trunk@37998 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-07-13 17:32:29 +00:00
Pascal Birchler
e4eee7ef5c
Plugins: Improve Ajax search of installed plugins.
...
Fixes a few accessibility issues, tweaks the design of the search form to match other Ajax search fields and improves compatibility with older browsers.
See #37230 .
Built from https://develop.svn.wordpress.org/trunk@38033
git-svn-id: http://core.svn.wordpress.org/trunk@37974 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-07-11 21:50:31 +00:00
Drew Jaynes
6c7148943b
Docs: Standardize capitalization of Ajax throughout core documentation per the core spelling guide.
...
Ajax, while considered an acronym for Asynchronous JavaScript and XML, is most commonly capitalized only in the first character.
Part props ocean90.
See #32246 .
Built from https://develop.svn.wordpress.org/trunk@38028
git-svn-id: http://core.svn.wordpress.org/trunk@37969 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-07-10 00:51:30 +00:00
Drew Jaynes
2ee0027bc1
Docs: Improve usefulness of DocBlocks for ajax-actions.php functions introduced in 4.6.
...
See #37318 .
Built from https://develop.svn.wordpress.org/trunk@38022
git-svn-id: http://core.svn.wordpress.org/trunk@37963 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-07-09 13:23:30 +00:00
Sergey Biryukov
4a62825a05
Text Changes: Remove duplicate string, use the one we already have.
...
See #34521 .
Built from https://develop.svn.wordpress.org/trunk@37960
git-svn-id: http://core.svn.wordpress.org/trunk@37901 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-07-04 22:10:28 +00:00
Sergey Biryukov
83cd70a5f6
Text Changes: Remove duplicate string, use the one we already have.
...
See #34521 .
Built from https://develop.svn.wordpress.org/trunk@37956
git-svn-id: http://core.svn.wordpress.org/trunk@37897 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-07-04 21:37:27 +00:00
Gary Pendergast
2d6b9ca91b
General: Remove the `Pragma` header from responses.
...
`Pragma` is supposed to be a request header, but we've been including it in responses since the beginning of time.
This is a relic dating all the way back to b2, probably originally added because Internet Explorer version 5 and earlier didn't understand the `Cache-Control` header in responses, but they did (incorrectly) obey the `Pragma` header.
Internet Explorer 6 and 7 will obey the `Pragma` response header only if no other cache-related response headers are present (in our case, they are always present), and all other browsers ignore the `Pragma` response header.
Props geekysoft.
Fixes #37250 .
Built from https://develop.svn.wordpress.org/trunk@37944
git-svn-id: http://core.svn.wordpress.org/trunk@37885 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-07-04 04:02:31 +00:00
Dominik Schilling
25e66e4f1e
Text Changes: Unify permission error messages.
...
The new format looks like "Sorry, you are not allowed to <action>.". This provides a consistent experience for all error messages related to missing permissions. It also reduces the number of similar strings and allows translators to provide a consistent style in their language.
Props ramiy, Presskopp.
Fixes #34521 .
Built from https://develop.svn.wordpress.org/trunk@37914
git-svn-id: http://core.svn.wordpress.org/trunk@37855 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-06-29 15:16:29 +00:00
Dominik Schilling
0b7b8981aa
Posts: In `wp_ajax_inline_save()`, do not apply level for non-hierarchical post types.
...
Props Offereins.
Fixes #35010 .
Built from https://develop.svn.wordpress.org/trunk@37913
git-svn-id: http://core.svn.wordpress.org/trunk@37854 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-06-29 14:07:31 +00:00
Rachel Baker
a2904cc309
Revisions: Change the capability needed to view revision diffs to `edit_post`.
...
Built from https://develop.svn.wordpress.org/trunk@37779
git-svn-id: http://core.svn.wordpress.org/trunk@37744 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-06-21 14:22:26 +00:00
Rachel Baker
d7e743a286
Comments: Wrap or unwrap the List Table comment_date as comment status changes via Ajax.
...
Introduced in [36521].
Fixes #36742 .
Props imath, adamsilverstein.
Built from https://develop.svn.wordpress.org/trunk@37743
git-svn-id: http://core.svn.wordpress.org/trunk@37708 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-06-17 21:48:27 +00:00
Andrew Ozz
accf240d37
Editor: after inserting a link detect if the URL is broken, first run.
...
Props iseulde, azaozz.
See #36638 .
Built from https://develop.svn.wordpress.org/trunk@37741
git-svn-id: http://core.svn.wordpress.org/trunk@37706 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-06-17 20:41:28 +00:00
Konstantin Obenland
8c82515ab6
Update/Install: Shiny Updates v2.
...
Gone are the days of isolation and feelings of "meh", brought on by The Bleak Screen of Sadness. For a shiny knight has arrived to usher our plugins and themes along their arduous journey of installation, updates, and the inevitable fate of ultimate deletion.
Props swissspidy, adamsilverstein, mapk, afragen, ocean90, ryelle, j-falk, michael-arestad, melchoyce, DrewAPicture, AdamSoucie, ethitter, pento, dd32, kraftbj, Ipstenu, jorbin, afercia, stephdau, paulwilde, jipmoors, khag7, svovaf, jipmoors, obenland.
Fixes #22029 , #25828 , #31002 , #31529 , #31530 , #31773 , #33637 , #35032 .
Built from https://develop.svn.wordpress.org/trunk@37714
git-svn-id: http://core.svn.wordpress.org/trunk@37680 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-06-15 16:37:29 +00:00
Peter Wilson
47d26cd9fb
DOCS: Replace HTTP links with HTTPS.
...
Replaces unsecure links in documentation and translator comments with their secure versions.
Props johnpgreen, netweb
Fixes #36993
Built from https://develop.svn.wordpress.org/trunk@37674
git-svn-id: http://core.svn.wordpress.org/trunk@37640 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-06-10 04:50:33 +00:00
Rachel Baker
ed964badae
Comments: Fix pagination totals in the response of the inline delete actions when filtering the List Table by comment_type.
...
Within the Ajax action `_wp_ajax_delete_comment_response()` if the comment_type query var is set, fallback to the previous `$total - 1` value instead of getting an incorrect value from `wp_comment_count()`.
Fixes #36991 .
Built from https://develop.svn.wordpress.org/trunk@37664
git-svn-id: http://core.svn.wordpress.org/trunk@37630 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-06-09 02:22:27 +00:00
Rachel Baker
9913b6eec4
Comments: Display approved comments on the Edit Post screen to users without the `edit_comment` capability.
...
Matches logic in `wp_dashboard_recent_comments()` where we display approved comments regardless of the edit permission.
Props jfarthing84 for initial patch.
Fixes #24648 .
Built from https://develop.svn.wordpress.org/trunk@37584
git-svn-id: http://core.svn.wordpress.org/trunk@37552 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-05-27 14:10:28 +00:00
Drew Jaynes
1947f4d17c
Docs: Apply inline `@see` tags to hooks referenced in DocBlocks for wp-admin/* files.
...
Applying these specially-crafted `@see` tags allows the Code Reference parser to recognize and link these elements as actions and filters.
See #36921 .
Built from https://develop.svn.wordpress.org/trunk@37537
git-svn-id: http://core.svn.wordpress.org/trunk@37505 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-05-23 17:28:27 +00:00
Drew Jaynes
c3055cc190
Docs: Standardize hook docs in wp-admin/* to use third-person singular verbs per the inline documentation standards for PHP.
...
See #36913 .
Built from https://develop.svn.wordpress.org/trunk@37488
git-svn-id: http://core.svn.wordpress.org/trunk@37456 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-05-22 18:01:30 +00:00
Drew Jaynes
b1804afeaf
Docs: Standardize on 'backward compatibility/compatible' nomenclature in core inline docs.
...
Also use 'back-compat' in some inline comments where backward compatibility is the subject and shorthand feels more natural.
Note: 'backwards compatibility/compatibile' can also be considered correct, though it's primary seen in regular use in British English.
Props ocean90.
Fixes #36835 .
Built from https://develop.svn.wordpress.org/trunk@37431
git-svn-id: http://core.svn.wordpress.org/trunk@37397 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-05-13 18:41:31 +00:00
Dominik Schilling
c3fe61770c
Media: Remove an extra quote when sending a link of a media file to the editor.
...
Introduced in [37035].
Props joemcgill, swissspidy, boonebgorges.
Fixes #36578 .
Built from https://develop.svn.wordpress.org/trunk@37288
git-svn-id: http://core.svn.wordpress.org/trunk@37254 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-04-21 21:21:28 +00:00
Aaron Jorbin
4e3df608dc
Remove Debugging code introduced in [37145]
...
Built from https://develop.svn.wordpress.org/trunk@37148
git-svn-id: http://core.svn.wordpress.org/trunk@37115 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-03-30 18:58:26 +00:00
Aaron Jorbin
bd7ffca854
Add Nonce to updating wporg_favorites user meta field
...
Built from https://develop.svn.wordpress.org/trunk@37145
git-svn-id: http://core.svn.wordpress.org/trunk@37112 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-03-30 18:36:26 +00:00
Nikolay Bachiyski
9b7a775413
Add nonce to AJAX action for script compression setting
...
Built from https://develop.svn.wordpress.org/trunk@37143
git-svn-id: http://core.svn.wordpress.org/trunk@37110 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-03-30 18:21:25 +00:00
Andrew Ozz
d47a15ed3c
Media: fix erroneously inserting a rel attribute in `get_image_send_to_editor()`. Reverts most of [34259] and [34260] and adds a unit test.
...
Props joemcgill, azaozz.
Fixes #36084 .
Built from https://develop.svn.wordpress.org/trunk@37035
git-svn-id: http://core.svn.wordpress.org/trunk@37002 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-03-18 20:05:26 +00:00
Drew Jaynes
d62a1bf1e9
Docs: Mark two private functions as such in wp-admin/ajax-actions.php.
...
See #32246 .
Built from https://develop.svn.wordpress.org/trunk@36472
git-svn-id: http://core.svn.wordpress.org/trunk@36439 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-02-03 20:17:26 +00:00
Ella Iseulde Van Dorpe
3663a5bca5
TinyMCE: add inline link dialog
...
First run.
Links the advanced button to the "old" dialog for now.
See #33301 .
Built from https://develop.svn.wordpress.org/trunk@36384
git-svn-id: http://core.svn.wordpress.org/trunk@36351 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-01-23 00:08:26 +00:00
John Blackbourn
7718e07129
Docs: Correct the parameter docs for various Heartbeat filters and functions.
...
See #32246
Built from https://develop.svn.wordpress.org/trunk@36231
git-svn-id: http://core.svn.wordpress.org/trunk@36198 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-01-09 01:37:26 +00:00
Ella Iseulde Van Dorpe
657d3b50af
Make date format consistent across the admin
...
The 'date_format' and 'time_format' options shouldn't affect the backend.
See #30864
Built from https://develop.svn.wordpress.org/trunk@35811
git-svn-id: http://core.svn.wordpress.org/trunk@35775 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-12-07 04:26:27 +00:00
Boone Gorges
714be37ea5
Show user_login in Dashboard user dropdowns.
...
User dropdowns in wp-admin have traditionally shown the users' display names.
However, this causes ambiguity when users share display names. To correct this,
we now show the unique user_login in parentheses after the display name.
The new `display_name_with_login` value for the `show` parameter of
`wp_dropdown_users()` enables this functionality. The default value of `show`
has not been changed, for backward compatibility, but all instances of
`wp_dropdown_users()` in core wp-admin have been switched.
This changeset also reduces some duplicated logic when assembling a user list
when `include_selected` is true.
Props krogsgard, boonebgorges.
Fixes #31251 .
Built from https://develop.svn.wordpress.org/trunk@35790
git-svn-id: http://core.svn.wordpress.org/trunk@35754 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-12-06 20:57:26 +00:00
Helen Hou-Sandí
2f287af8aa
Media: Avoid `rel="rel="` situations.
...
props lucymtc, swissspidy.
fixes #34826 . see #32074 .
Built from https://develop.svn.wordpress.org/trunk@35760
git-svn-id: http://core.svn.wordpress.org/trunk@35724 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-12-03 17:17:26 +00:00
Mark Jaquith
1a43f0b290
Do not pass FALSE as second parameter in variable class_exists() checks
...
Because these are generally plugin-provided, we want plugins to be
able to use autoloaders.
fixes #20523
Built from https://develop.svn.wordpress.org/trunk@35749
git-svn-id: http://core.svn.wordpress.org/trunk@35713 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-11-30 04:15:27 +00:00
Dominik Schilling
99f4fc4404
Themes: Check if the browse view is set in `wp_ajax_query_themes()` to avoid a PHP notice when searching for new themes.
...
Introduced in [35527].
See #34206 .
Built from https://develop.svn.wordpress.org/trunk@35646
git-svn-id: http://core.svn.wordpress.org/trunk@35610 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-11-16 19:47:54 +00:00
Sergey Biryukov
a41e5d0270
Themes: Add a Favorites tab to the Add Themes screen.
...
You can now browse and install your wordpress.org theme favorites from the theme installer, just like with plugins.
Props swissspidy.
Fixes #34206 .
Built from https://develop.svn.wordpress.org/trunk@35527
git-svn-id: http://core.svn.wordpress.org/trunk@35491 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-11-04 21:49:26 +00:00
Dominik Schilling
122f38f748
List Tables: Define the global `$mode` variable for Quick Edit savings.
...
Also remove two unused global imports for `$mode`.
Fixes #34577 .
Built from https://develop.svn.wordpress.org/trunk@35518
git-svn-id: http://core.svn.wordpress.org/trunk@35482 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-11-04 21:29:25 +00:00
Scott Taylor
dc1e85a540
Nav Menus: show custom post type Archive item at the top of the `View All` tab for the post type on the legacy Nav Menu screen.
...
Props aaroncampbell, DrewAPicture, seanchayes, hlashbrooke, paulwilde, ericlewis, raulillana
See #16075 .
Built from https://develop.svn.wordpress.org/trunk@35382
git-svn-id: http://core.svn.wordpress.org/trunk@35346 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-10-24 17:46:25 +00:00
Dion Hulse
c9d0c0a9bd
Updates: Add a generic failure case to the ajax update endpoint for when the `WP_Error` value hasn't been found.
...
See #34403
Built from https://develop.svn.wordpress.org/trunk@35371
git-svn-id: http://core.svn.wordpress.org/trunk@35335 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-10-23 07:35:25 +00:00
Andrew Ozz
71ac079074
Widgets: add a button to delete all inactive widgets simultaneously for better UX.
...
Props cdog.
Fixes #19159 .
Built from https://develop.svn.wordpress.org/trunk@35317
git-svn-id: http://core.svn.wordpress.org/trunk@35283 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-10-21 05:23:26 +00:00
Drew Jaynes
c78ee60edd
Docs: Standardize file header summary for wp-admin/includes/ajax-actions.php.
...
See #33701 .
[ci skip]
Built from https://develop.svn.wordpress.org/trunk@35168
git-svn-id: http://core.svn.wordpress.org/trunk@35134 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-10-14 22:49:24 +00:00
Sergey Biryukov
ac9a85a45e
Use `wp_star_rating()` on Add Themes screen:
...
* It works correctly for RTL
* Requires less CSS styling
* Is visually consistent with plugin ratings
* Is more accessible
Fixes #34080 .
Built from https://develop.svn.wordpress.org/trunk@35006
git-svn-id: http://core.svn.wordpress.org/trunk@34971 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-10-10 06:51:24 +00:00
Jeremy Felt
9926983b66
Revert [34778], continue using `_site_option()` for the current network.
...
The `_network_option()` parameter order will be changing to accept `$network_id` first. The `_site_option()` functions will remain in use throughout core as our way of retrieving a network option for the current network.
See #28290 .
Built from https://develop.svn.wordpress.org/trunk@34912
git-svn-id: http://core.svn.wordpress.org/trunk@34877 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-10-07 17:11:25 +00:00
Jeremy Felt
54512d64cb
MS: Use `*_network_option()` functions throughout core.
...
Replaces all uses of `*_site_option()` with the corresponding "network" function.
This excludes one usage in `wp-admin/admin-footer.php` that needs more investigation.
Props spacedmonkey.
See #28290 .
Built from https://develop.svn.wordpress.org/trunk@34778
git-svn-id: http://core.svn.wordpress.org/trunk@34743 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-10-02 19:08:26 +00:00
Drew Jaynes
5ec1077a38
Widgets: Introduce a `delete_widget` action, which fires after a widget has been marked for deletion.
...
Props afercia for the initial patch.
Fixes #27444 .
Built from https://develop.svn.wordpress.org/trunk@34714
git-svn-id: http://core.svn.wordpress.org/trunk@34678 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-09-30 03:21:26 +00:00
Scott Taylor
5b9af35c4c
Comments: update Comment counts dynamically in the Right Now widget based on moderation actions in the Activity widget.
...
Fixes #10422 .
Built from https://develop.svn.wordpress.org/trunk@34500
git-svn-id: http://core.svn.wordpress.org/trunk@34464 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-09-24 15:53:25 +00:00
Scott Taylor
84da11d918
Pass `false` as the 2nd argument to `class_exists()` to disable autoloading and to not cause problems for those who define `__autoload()`.
...
Fixes #20523 .
Built from https://develop.svn.wordpress.org/trunk@34348
git-svn-id: http://core.svn.wordpress.org/trunk@34312 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-09-20 03:52:25 +00:00
Dominik Schilling
622d4bd029
Use correct `@since` tag for `wp_ajax_generate_password()`.
...
See #33450 .
Built from https://develop.svn.wordpress.org/trunk@34313
git-svn-id: http://core.svn.wordpress.org/trunk@34277 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-09-18 20:19:25 +00:00
Scott Taylor
c43f72fbfb
Profile: when clicking "Cancel" after clicking "Generate Password", request and generate a new password to present to the user.
...
Props adamsilverstein, wonderboymusic.
Fixes #33450 .
Built from https://develop.svn.wordpress.org/trunk@34312
git-svn-id: http://core.svn.wordpress.org/trunk@34276 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-09-18 20:14:24 +00:00
Sergey Biryukov
6a6d8ba4b8
Include placeholder in translator comment.
...
See #31864 .
Built from https://develop.svn.wordpress.org/trunk@34305
git-svn-id: http://core.svn.wordpress.org/trunk@34269 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-09-18 19:01:24 +00:00
Scott Taylor
40c45718af
Don't use HTML tags in translation strings in `wp_ajax_add_user()`.
...
Props ramiy.
Fixes #31864 .
Built from https://develop.svn.wordpress.org/trunk@34302
git-svn-id: http://core.svn.wordpress.org/trunk@34266 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-09-18 18:51:26 +00:00
Scott Taylor
f3dd19c6e2
Media: In `wp_ajax_send_attachment_to_editor()`, the fallback logic for `$html` should be tucked into an `else` statement so it isn't run needlessly and overwritten.
...
Props tychay.
Fixes #32072 .
Built from https://develop.svn.wordpress.org/trunk@34260
git-svn-id: http://core.svn.wordpress.org/trunk@34224 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-09-17 05:55:25 +00:00
Scott Taylor
54829b6305
Create a function, `get_preview_post_link()`, to DRY the logic for applying the `'preview_post_link'` filter to a URL.
...
Props TomHarrigan, wonderboymusic.
Fixes #24345 .
Built from https://develop.svn.wordpress.org/trunk@34170
git-svn-id: http://core.svn.wordpress.org/trunk@34138 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-09-15 04:15:25 +00:00
Scott Taylor
191400f9e6
Don't ever use the `guid` value when retrieving URLs for media, use `wp_get_attachment_url()`. Use `get_attached_file()` for path to file.
...
Fixes #33386 .
Built from https://develop.svn.wordpress.org/trunk@34163
git-svn-id: http://core.svn.wordpress.org/trunk@34131 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-09-15 02:50:25 +00:00
Scott Taylor
69e3a390b2
In `_wp_ajax_delete_comment_response()`, read the new `'all'` prop returned by `get_comment_count()` via `wp_count_comments()` when setting `$total`. `'all'` doesn't include `spam` in its count.
...
Updates unit tests.
Props dipesh.kakadiya.
Fixes #32362 .
Built from https://develop.svn.wordpress.org/trunk@34161
git-svn-id: http://core.svn.wordpress.org/trunk@34129 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-09-15 01:47:25 +00:00
Scott Taylor
7639a89a1f
`wp_unspam_comment()` can accept a full object instead of comment_ID to reduce cache/db lookups..
...
See #33638 .
Built from https://develop.svn.wordpress.org/trunk@34130
git-svn-id: http://core.svn.wordpress.org/trunk@34098 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-09-14 21:47:25 +00:00
Scott Taylor
b1bc8a6522
More comment functions can accept a full object instead of comment_ID to reduce cache/db lookups.
...
See ##33638.
Built from https://develop.svn.wordpress.org/trunk@34129
git-svn-id: http://core.svn.wordpress.org/trunk@34097 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-09-14 21:40:24 +00:00
Scott Taylor
ed83979728
AJAX Reply to Comment: check the `edit_comment` cap when parent comment will be auto-approved.
...
Props rachelbaker.
Fixes #23939 .
Built from https://develop.svn.wordpress.org/trunk@34074
git-svn-id: http://core.svn.wordpress.org/trunk@34042 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-09-12 07:19:25 +00:00
Sergey Biryukov
c177344508
Merge two permission error strings.
...
Props pavelevap.
Fixes #33745 .
Built from https://develop.svn.wordpress.org/trunk@33933
git-svn-id: http://core.svn.wordpress.org/trunk@33902 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-09-06 06:42:26 +00:00
Scott Taylor
0fa7f817c4
In `wp_ajax_add_meta()`, do not juggle the value of `$_POST` and alter it directly. This was done so that `edit_post()` could pull `$_POST` out of the air by-reference and alter it (equally as bad). `edit_post()` accepts a `$post_data` array. Do that instead.
...
See #33491 .
Built from https://develop.svn.wordpress.org/trunk@33697
git-svn-id: http://core.svn.wordpress.org/trunk@33664 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-08-21 18:13:24 +00:00
Scott Taylor
20f6db2b18
Comment List Tables:
...
* Ensure that dynamic bubble counts are in sync by `comment_post_ID`
* Scope `:animated` to `#the-comment-list`
See #11200 .
Built from https://develop.svn.wordpress.org/trunk@33662
git-svn-id: http://core.svn.wordpress.org/trunk@33629 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-08-20 16:36:25 +00:00
Scott Taylor
df618f3461
Comments List Table:
...
* Show count next to "Approved"
* Properly increment/decrement counts when row actions are clicked
* In `_wp_ajax_delete_comment_response()`, return the comment's `status` with the `supplemental` data
* Handle counts properly on each scenario of `undo`
See #11200 .
Built from https://develop.svn.wordpress.org/trunk@33655
git-svn-id: http://core.svn.wordpress.org/trunk@33622 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-08-20 02:51:25 +00:00
Andrew Ozz
fa25fe82ef
Fix updating of nonces on the Edit Post screen after the log in expires and the user logs in again.
...
Props iseulde, azaozz. Fixes #33098 .
Built from https://develop.svn.wordpress.org/trunk@33468
git-svn-id: http://core.svn.wordpress.org/trunk@33435 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-07-28 22:07:25 +00:00
Sergey Biryukov
67618d5cc0
Merge similar strings for plugin update permissions.
...
props pavelevap.
fixes #32388 .
Built from https://develop.svn.wordpress.org/trunk@33432
git-svn-id: http://core.svn.wordpress.org/trunk@33399 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-07-26 23:01:25 +00:00
Konstantin Obenland
0f61e187b6
Site Icon: Create custom sizes for images that don't need cropping.
...
This will duplicate an image that doesn't need cropping once and will skip
creating new images and custom sizes if the selected image has the `site-icon`
context.
Fixes #33011 .
Built from https://develop.svn.wordpress.org/trunk@33356
git-svn-id: http://core.svn.wordpress.org/trunk@33328 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-07-22 02:30:25 +00:00
Scott Taylor
432f9891f7
Ensure that private posts cannot be made sticky via Quick Edit.
...
DRY the logic for stickies in `wp_xmlrpc_server` by introducing `->_toggle_sticky()`.
Props wonderboymusic, obenland, chriscct7.
Fixes #20662 .
Built from https://develop.svn.wordpress.org/trunk@33325
git-svn-id: http://core.svn.wordpress.org/trunk@33297 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-07-19 18:09:25 +00:00
Konstantin Obenland
2883bbbb68
Customize: Provide a default way to save cropped images.
...
Allows plugins and themes to use `WP_Customize_Cropped_Image_Control` without
having to define their own way of saving the cropped image.
Props celloexpressions for initial patch.
Fixes #29211 .
Built from https://develop.svn.wordpress.org/trunk@33280
git-svn-id: http://core.svn.wordpress.org/trunk@33252 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-07-15 19:54:25 +00:00
Dion Hulse
43077a6ef8
Updates: When performing an ajax plugin update, rely upon `wp_update_plugins()` to check the contents of the transient and return early if no request needs to be made.
...
This works around a bug where custom update handlers are injecting an update into an empty transient, malforming the transient and causing update failures.
Fixes #32198 for trunk
Built from https://develop.svn.wordpress.org/trunk@33257
git-svn-id: http://core.svn.wordpress.org/trunk@33229 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-07-14 08:01:25 +00:00
Drew Jaynes
703d4c259c
Fix filter doc vernacular for the new `wp_ajax_cropped_attachment_id` hook added in 4.3.
...
See #32891 .
Built from https://develop.svn.wordpress.org/trunk@33176
git-svn-id: http://core.svn.wordpress.org/trunk@33148 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-07-12 18:26:24 +00:00
Konstantin Obenland
f29e5044cd
Site Icon: Add Customizer UI.
...
Second part of the Site Icon feature after [32994] introduced it for Settings.
Props celloexpressions.
See #16434 .
Built from https://develop.svn.wordpress.org/trunk@33154
git-svn-id: http://core.svn.wordpress.org/trunk@33126 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-07-10 21:33:24 +00:00
Scott Taylor
8b1286417e
`ob_get_contents()` followed by `ob_end_clean()` can be replaced by `ob_get_clean()`.
...
See #32444 .
Built from https://develop.svn.wordpress.org/trunk@32965
git-svn-id: http://core.svn.wordpress.org/trunk@32936 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-06-27 01:12:24 +00:00
Dion Hulse
0eb8bfc464
Updates: When a error occurs during the connection phase, pass the error message back as the ajax failure message.
...
See #32435
Built from https://develop.svn.wordpress.org/trunk@32778
git-svn-id: http://core.svn.wordpress.org/trunk@32749 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-06-15 03:32:27 +00:00
Scott Taylor
18827ed337
In `wp_ajax_hidden_columns()`, don't `explode()` on an empty string.
...
In `columns.hidden()`, which lives in `common.js`, don't return items with no `id`.
This was resulting in options like `manageedit-postcolumnshidden` containing a serialized array with random empty items.
Props afercia, wonderboymusic.
Fixes #32466 .
Built from https://develop.svn.wordpress.org/trunk@32751
git-svn-id: http://core.svn.wordpress.org/trunk@32722 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-06-13 15:00:25 +00:00
Andrew Ozz
b3d04247b7
Editor:
...
- Remove the old DFW.
- Add back-compat stub for wp-fullscreen.js.
- Keep wp_ajax_wp_fullscreen_save_post() for now.
See #30949 .
Built from https://develop.svn.wordpress.org/trunk@32677
git-svn-id: http://core.svn.wordpress.org/trunk@32647 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-06-01 17:38:29 +00:00
Scott Taylor
9a29d8ac7b
Add missing` annotations to `ajax-actions.php`
...
See #32444 .
Built from https://develop.svn.wordpress.org/trunk@32652
git-svn-id: http://core.svn.wordpress.org/trunk@32622 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-05-29 16:01:27 +00:00
Scott Taylor
b56b9b3e5c
Add `@global` annotations for `wp-admin/*`.
...
See #32444 .
Built from https://develop.svn.wordpress.org/trunk@32642
git-svn-id: http://core.svn.wordpress.org/trunk@32612 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-05-28 21:41:30 +00:00
Drew Jaynes
4c37f68b79
Fix inline documentation syntax in `wp_xmlrpc_server`.
...
See #32246 .
Built from https://develop.svn.wordpress.org/trunk@32591
git-svn-id: http://core.svn.wordpress.org/trunk@32561 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-05-25 06:25:25 +00:00
Scott Taylor
2807b7146f
After [32258], restore the parts of [31620] and [31626] that weren't changes to the UI, but were improvements to existing code.
...
* Use `wp.shortcode()` instead of manually constructing a shortcode in `views/embed/link`
* In `WP_Embed`, store the last URL and last set of attributes requested in class properties
* `wp_ajax_parse_embed()`, allow `[embed]`s to have attributes. Return `attr` in the response.
See #31139 .
Built from https://develop.svn.wordpress.org/trunk@32330
git-svn-id: http://core.svn.wordpress.org/trunk@32301 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-04-30 21:40:25 +00:00
Andrew Ozz
60706015e1
Revert editing of video embed parameters in the media modal, [31620] and [31626] for now. Plan on revisiting in 4.3.
...
Props iseulde. Fixes #31139 , fixes #32006 .
Built from https://develop.svn.wordpress.org/trunk@32258
git-svn-id: http://core.svn.wordpress.org/trunk@32229 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-04-21 22:41:26 +00:00
Boone Gorges
54a6a8e137
Don't allow whitespace-only image captions from the Media modal.
...
Captions containing only whitespace trick `image_add_caption()` into thinking
a caption is required, but the empty caption text confuses wpeditimage into
stripping the 'align' class specified by the user.
Fixes #21848 .
Built from https://develop.svn.wordpress.org/trunk@32079
git-svn-id: http://core.svn.wordpress.org/trunk@32058 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-04-08 17:11:27 +00:00
Helen Hou-Sandí
42028327a2
Insert from URL: Make sure the link text is actually used.
...
Turns out there were more pieces to renaming the field.
props iseulde.
fixes #29476 .
Built from https://develop.svn.wordpress.org/trunk@32055
git-svn-id: http://core.svn.wordpress.org/trunk@32034 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-04-06 18:25:27 +00:00
Drew Jaynes
b500d3e978
Fix typos in the function summaries for `wp_ajax_press_this_save_post()` and `wp_ajax_press_this_add_category()`.
...
See [31534]. See #31888 .
Built from https://develop.svn.wordpress.org/trunk@32007
git-svn-id: http://core.svn.wordpress.org/trunk@31986 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-04-04 14:38:26 +00:00
Drew Jaynes
05fa6879ce
Add an `@see` mention for `Plugin_Upgrader`, plus spacing to the `wp_ajax_update_plugin()` delcaration.
...
See #31888 .
Built from https://develop.svn.wordpress.org/trunk@32006
git-svn-id: http://core.svn.wordpress.org/trunk@31985 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-04-04 14:19:27 +00:00