Helen Hou-Sandí
60431ae239
Permalinks: Slightly lengthen the truncated slug for display.
...
This brings it closer to the width of the input so there is less jumping around of buttons. We can afford the space now that other buttons in the space are typically no longer there.
fixes #18306 .
Built from https://develop.svn.wordpress.org/trunk@34833
git-svn-id: http://core.svn.wordpress.org/trunk@34798 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-10-05 19:29:24 +00:00
Scott Taylor
594a208753
Post List Table: Ensure that edit.php
with no query string produces the proper markup and links in the date
column header.
...
Add 2 methods to `WP_List_Table`, `->get_orderby()` and `->get_order()`. Override the methods in `WP_Posts_List_Table`.
`WP_Posts_List_Table` calls `wp_edit_posts_query()` in `->prepare_items()` which is a wrapper for `wp()`. As such, we can obtain `orderby` and `order` via `get_query_var()`, instead of the URL.
Fixes #25493 .
Built from https://develop.svn.wordpress.org/trunk@34728
git-svn-id: http://core.svn.wordpress.org/trunk@34692 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-10-01 02:10:25 +00:00
Gary Pendergast
cf173408cd
Permalinks: Add pretty permalinks for unattached attachments.
...
Previously, unattached attachments would have unsightly `/?attachment_id=1` URLs. As we've moved away from attachments being specifically attached to posts, instead being Media items, this has made the unattached URLs a more common occurrence.
We can breath easy once more, knowing that the world is a little bit safer from the horror of unnecessarily ugly URLs.
Props SergeyBiryukov, wonderboymusic, pento.
Fixes #1914 .
Built from https://develop.svn.wordpress.org/trunk@34690
git-svn-id: http://core.svn.wordpress.org/trunk@34654 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-09-29 09:42:26 +00:00
Helen Hou-Sandí
e976f9b503
Edit: Remove the redundant "View Post" button-link and link the sample permalink.
...
Previously there were two persistent "View Post" links on an edit screen: next to the permalink and in the toolbar. This would then become three links after a post was published or updated, as a link is also included in the admin notice. This is a lot of redundancy and visual noise for a flow that is not your primary action upon starting to edit a post. The "View Post" link next to the sample permalink was particularly bad because it is styled like a button, but unlike a button, does not keep you on the current screen.
Because the permalink is now linked, there is no highlighted slug that you can click to edit, but rather just the "Edit" button.
props scribu, lessbloat, sabreuse, SergeyBiryukov, DrewAPicture, helen.
see #18306 .
Built from https://develop.svn.wordpress.org/trunk@34670
git-svn-id: http://core.svn.wordpress.org/trunk@34634 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-09-28 20:10:26 +00:00
Scott Taylor
82709c30d9
The 'get_sample_permalink_html'
filter's second parameter can be a post ID or a post object. This is confusing. We should pass the post ID and post object separately, for consistency with 'get_sample_permalink'
filter added in [34309].
...
Props SergeyBiryukov.
Fixes #33927 .
Built from https://develop.svn.wordpress.org/trunk@34347
git-svn-id: http://core.svn.wordpress.org/trunk@34311 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-09-20 03:26:25 +00:00
Scott Taylor
e47963d1e7
Edit Post: When a post is "Pending Review", the "View Post" link should behave like ot does for drafts and generate a preview link.
...
Props wpdev101.
Fixes #33541 .
Built from https://develop.svn.wordpress.org/trunk@34324
git-svn-id: http://core.svn.wordpress.org/trunk@34288 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-09-19 16:32:24 +00:00
Scott Taylor
d28e914a06
When applying the 'editable_slug'
filter, add a second param that provides more context.
...
Props MikeSchinkel, jesin.
Fixes #31568 .
Built from https://develop.svn.wordpress.org/trunk@34319
git-svn-id: http://core.svn.wordpress.org/trunk@34283 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-09-19 05:49:24 +00:00
Scott Taylor
04f7a0da2f
Add a 'get_sample_permalink' filter.
...
Props SergeyBiryukov, wenthemes, JustinSainton.
Fixes #22338 .
Built from https://develop.svn.wordpress.org/trunk@34309
git-svn-id: http://core.svn.wordpress.org/trunk@34273 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-09-18 19:28:26 +00:00
Sergey Biryukov
514eb11cf4
Revert unintended change from [34262].
...
See #33910 .
Built from https://develop.svn.wordpress.org/trunk@34263
git-svn-id: http://core.svn.wordpress.org/trunk@34227 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-09-17 09:09:28 +00:00
Sergey Biryukov
d91fe61405
Docs: Expand the DocBlock for get_default_post_to_edit()
.
...
Props rabmalin.
Fixes #33910 .
Built from https://develop.svn.wordpress.org/trunk@34262
git-svn-id: http://core.svn.wordpress.org/trunk@34226 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-09-17 09:06:34 +00:00
John Blackbourn
a5a8ae45a6
Remove outdated references to the preview_post_link
filter docs.
...
See #24345
Props paulwilde
Built from https://develop.svn.wordpress.org/trunk@34178
git-svn-id: http://core.svn.wordpress.org/trunk@34146 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-09-15 10:32:31 +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
503aa8b76d
Move redirect_post()
from wp-admin/post.php
to wp-admin/includes/post.php
.
...
See #33813 .
Built from https://develop.svn.wordpress.org/trunk@34020
git-svn-id: http://core.svn.wordpress.org/trunk@33989 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-09-10 21:31:24 +00:00
Scott Taylor
02ae926dfd
Round 2 of: We should use ellipses … / … instead of three dots/periods ... e.g Loading… not Loading...
...
Props yoavf.
Fixes #32875 .
Built from https://develop.svn.wordpress.org/trunk@33970
git-svn-id: http://core.svn.wordpress.org/trunk@33939 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-09-09 04:39:25 +00:00
John Blackbourn
6d7aeeac03
Don't change the View Post button permalink in the sample permalink HTML when updating the slug on a published or future post.
...
Fixes #32954
Props boonebgorges, johnbillion
Built from https://develop.svn.wordpress.org/trunk@33773
git-svn-id: http://core.svn.wordpress.org/trunk@33741 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-08-27 20:57:22 +00:00
Scott Taylor
ef87172270
foreach
is a statement, not a function.
...
See #33491 .
Built from https://develop.svn.wordpress.org/trunk@33734
git-svn-id: http://core.svn.wordpress.org/trunk@33702 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-08-25 20:28:22 +00:00
Dominik Schilling
a9b3f12826
Heartbeat: Ensure post locks are released.
...
Built from https://develop.svn.wordpress.org/trunk@33542
git-svn-id: http://core.svn.wordpress.org/trunk@33509 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-08-04 04:54:34 +00:00
Konstantin Obenland
c9a29b0123
Check for all required caps before (un)sticking a post.
...
In cases where a user has the `edit_others_posts` capability but not
`publish_posts`, it was possible for that user to unstick a post after editing,
since the input field was never made available in that context.
Props ericmann, chriscct7.
Fixes #24153 .
Built from https://develop.svn.wordpress.org/trunk@33096
git-svn-id: http://core.svn.wordpress.org/trunk@33067 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-07-06 22:41:25 +00:00
Konstantin Obenland
a4e803fbd4
Use get_default_comment_status()
globally.
...
Also makes the filter name static and passes the post type for context.
Props valendesigns.
Fixes #31168 .
Built from https://develop.svn.wordpress.org/trunk@33054
git-svn-id: http://core.svn.wordpress.org/trunk@33025 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-07-02 22:32:25 +00:00
Scott Taylor
5c6b63d3a6
if
is a statment, not a function.
...
See #32444 .
Built from https://develop.svn.wordpress.org/trunk@32800
git-svn-id: http://core.svn.wordpress.org/trunk@32771 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-06-16 20:01:25 +00:00
John Blackbourn
02192cb53f
Introduce featured_image
, set_featured_image
, remove_featured_image
, and use_featured_image
post type labels when registering a post type in order to override the 'Featured Image' text and its related phrases.
...
Props johnbillion, mordauk, valendesigns.
Fixes #19257 .
Built from https://develop.svn.wordpress.org/trunk@32673
git-svn-id: http://core.svn.wordpress.org/trunk@32643 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-05-31 16:54:27 +00:00
Scott Taylor
282e28ad81
Add @global
annotations to (the rest of the?) wp-admin/*
files.
...
Does not include list table file changes.
See #32444 .
Built from https://develop.svn.wordpress.org/trunk@32643
git-svn-id: http://core.svn.wordpress.org/trunk@32613 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-05-29 02:06:31 +00:00
Drew Jaynes
7c3e469326
Clarify the DocBlock summary and parameter description for wp_edit_attachments_query_vars()
.
...
See [31037]. See #31888 .
Built from https://develop.svn.wordpress.org/trunk@32019
git-svn-id: http://core.svn.wordpress.org/trunk@31998 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-04-04 21:52:25 +00:00
Boone Gorges
62450e9f0f
After [31114] and [31323], 'View Post' generated in get_sample_permalink_html()
should go to pretty permalink.
...
`get_permalink()` will return a non-pretty permalink for future posts, which
breaks some user workflows that expect View Post to lead to a page with the
pretty permalink.
Fixes #30910 .
Built from https://develop.svn.wordpress.org/trunk@32002
git-svn-id: http://core.svn.wordpress.org/trunk@31981 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-04-04 01:27:28 +00:00
Boone Gorges
60c26865f9
Check that $_POST
array index is set before comparing it in post_preview()
.
...
This prevents PHP notices in cases where a user with 'edit_others_posts' but
without 'publish_posts' previews another user's posts.
Props tyxla.
Fixes #31760 .
Built from https://develop.svn.wordpress.org/trunk@31896
git-svn-id: http://core.svn.wordpress.org/trunk@31875 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-03-26 01:45:26 +00:00
John Blackbourn
bb99536bf5
Introduce a new algorithm for displaying a hierarchical list of post objects in the WP_Posts_List_Table
. This reduces processing time, reduces database queries, and substantially reduces memory use on sites with a high number of Pages.
...
Props nofearinc, rodrigosprimo, nacin, johnbillion.
Fixes #15459
Built from https://develop.svn.wordpress.org/trunk@31730
git-svn-id: http://core.svn.wordpress.org/trunk@31711 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-03-11 20:46:27 +00:00
Scott Taylor
0ec87e4584
There are a few functions that have the ability to return false
instead of a string, so the return value should be checked before being passed to functions that expect string.
...
These are trivial, but they clear out some Scrutinizer issues.
See #30799 .
Built from https://develop.svn.wordpress.org/trunk@31681
git-svn-id: http://core.svn.wordpress.org/trunk@31662 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-03-09 02:11:28 +00:00
Boone Gorges
72f18cb067
Don't parse empty 'tax_input' keys in edit_post()
.
...
This fixes a bug introduced in [31359] where saving a tax_input that contained
only whitespace would result in a random tag being erroneously added to the
post.
See #30615 .
Built from https://develop.svn.wordpress.org/trunk@31392
git-svn-id: http://core.svn.wordpress.org/trunk@31373 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-02-09 22:54:28 +00:00
Boone Gorges
b9e661dcae
Parse non-hierarchical tag input into term IDs before sending to wp_insert_post()
.
...
When editing a post, non-hierarchical taxonomy terms are sent as the
comma-separated list entered into the tax_input metabox. Passing these
values directly to `wp_update_post()` meant that they were interpreted as
term slugs rather than term names, causing mismatches when a typed string
matched the slug of one term and the name of a different term. We fix the
problem by preprocessing tax_input data sent from post.php, converting it to
unambiguous term_ids before saving.
Props boonebgorges, ArminBraun.
Fixes #30615 .
Built from https://develop.svn.wordpress.org/trunk@31359
git-svn-id: http://core.svn.wordpress.org/trunk@31340 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-02-06 20:32:22 +00:00
Boone Gorges
eec82f9330
In get_sample_permalink()
, override 'future' status before generating permalink.
...
In [31114], `get_permalink()` was modified to prevent pretty permalinks from
being generated for posts with the 'future' post status. This inadvertently
broke the pretty permalink preview for scheduled posts. The fix is to include
the 'future' status in the list of statuses that `get_sample_permalink()` fakes
as 'publish' before it fetches a permalink.
Props DrewAPicture.
Fixes #30910 .
Built from https://develop.svn.wordpress.org/trunk@31323
git-svn-id: http://core.svn.wordpress.org/trunk@31304 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-02-02 16:50:22 +00:00
Drew Jaynes
f3033f34c6
Add missing descriptions to the DocBlocks for various functions in wp-admin/includes/post.php
...
Props ipm-frommen.
See #31008 .
Built from https://develop.svn.wordpress.org/trunk@31292
git-svn-id: http://core.svn.wordpress.org/trunk@31273 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-01-29 11:32:22 +00:00
Scott Taylor
6704875855
Replace the 3 remaining occurrences of wpspin
GIF with spinner
.
...
Props avryl.
Fixes #27482 .
Built from https://develop.svn.wordpress.org/trunk@31187
git-svn-id: http://core.svn.wordpress.org/trunk@31168 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-01-16 00:33:22 +00:00
Scott Taylor
c5f9a7c26a
Respect query vars for taxonomies passed as URL parameters when in grid mode of Media Library.
...
Fixes #30584 .
Built from https://develop.svn.wordpress.org/trunk@31037
git-svn-id: http://core.svn.wordpress.org/trunk@31018 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-01-03 08:24:22 +00:00
Sergey Biryukov
0ef8e683f2
Revert [28948], which caused a regression.
...
see #29573 for trunk. see #28350 .
Built from https://develop.svn.wordpress.org/trunk@30791
git-svn-id: http://core.svn.wordpress.org/trunk@30781 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-12-08 21:14:23 +00:00
Drew Jaynes
cc4ac906dc
Fix a typo in the return description for get_sample_permalink()
.
...
Props TobiasBg.
Fixes #30591 .
Built from https://develop.svn.wordpress.org/trunk@30755
git-svn-id: http://core.svn.wordpress.org/trunk@30745 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-12-06 21:46:23 +00:00
Drew Jaynes
23707b1ada
Convert various uses of (optional)
in core parameter descriptions to use the style prescribed in the inline documentation standards for PHP.
...
The style for marking parameters optional in inline PHP docs is: `@param type $var Optional. Description. Accepts. Default.`, where Accepts can be omitted on a case-by-case basis.
Props coffee2code.
Fixes #30591 .
Built from https://develop.svn.wordpress.org/trunk@30753
git-svn-id: http://core.svn.wordpress.org/trunk@30743 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-12-06 21:24:45 +00:00
Scott Taylor
2c32752abd
Improve various @param
docs for src/wp-admin/*
.
...
See #30224 .
Built from https://develop.svn.wordpress.org/trunk@30680
git-svn-id: http://core.svn.wordpress.org/trunk@30670 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-12-01 01:00:22 +00:00
Drew Jaynes
78bb3e5ff5
Docs Formatting: Backtick-escape inline code for all dynamic hook docs in wp-admin/includes/*.
...
Also adds a few inline `@see` cross-references as they apply.
Affects DocBlocks for the following hooks:
* `views_{$this->screen->id}`
* `bulk_actions-{$this->screen->id}`
* `manage_{$this->screen->id}_sortable_columns`
* `theme_action_links_$stylesheet`
* `after_theme_row_$stylesheet`
* `install_plugins_table_api_args_$tab`
* `$prefix . plugin_action_links`
* `after_plugin_row_$plugin_file`
* `manage_taxonomies_for_{$post_type}_columns`
* `manage_{$post_type}_posts_columns`
* `manage_{$post->post_type}_posts_custom_column`
* `{$taxonomy}_row_actions`
* `manage_{$this->screen->taxonomy}_custom_column`
* `install_themes_table_api_args_' . $tab`
* `auto_update_ . $type`
* `{$action}_prefilter`
* `admin_head_{$content_func}`
* `nav_menu_items_{$post_type_name}`
* `activate_ . $plugin`
* `deactivate_ . $plugin`
* `edit_{$post_type}_per_page`
* `postbox_classes_{$page}_{$id}`
* `_wp_post_revision_field_$field`
* `manage_{$screen->id}_columns`
* `in_plugin_update_message-{$file}`
* `in_theme_update_message-{$theme_key}`
See #30552 .
Built from https://develop.svn.wordpress.org/trunk@30648
git-svn-id: http://core.svn.wordpress.org/trunk@30638 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-11-30 11:28:24 +00:00
Drew Jaynes
3ceb75bd8e
Specify a type (array) for the $post_data
parameter in the DocBlock for wp_autosave()
.
...
Props tillkruess.
See #30508 .
Built from https://develop.svn.wordpress.org/trunk@30645
git-svn-id: http://core.svn.wordpress.org/trunk@30635 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-11-30 10:01:23 +00:00
Boone Gorges
c6e752b063
In get_default_post_to_edit()
, let 'post_name' be passed to filter.
...
Previously, it was being overridden after the default post had been inserted
into the database, making it cumbersome to override with the 'wp_insert_post_data'
filter.
Props danielbachhuber.
Fixes #29847 .
Built from https://develop.svn.wordpress.org/trunk@30626
git-svn-id: http://core.svn.wordpress.org/trunk@30616 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-11-29 19:26:23 +00:00
John Blackbourn
cd99d5915f
Decode the sample permalink shown to the user. This avoids showing encoded non-Latin characters in the sample permalink.
...
Fixes #16496
Props linuxologos
Built from https://develop.svn.wordpress.org/trunk@30364
git-svn-id: http://core.svn.wordpress.org/trunk@30363 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-11-17 03:00:21 +00:00
Gary Pendergast
e61bebdbfc
If a saving a post fails, remove any invalid characters (such as emoji) from the primary text fields, then try to save it again.
...
See #21212 .
Built from https://develop.svn.wordpress.org/trunk@30346
git-svn-id: http://core.svn.wordpress.org/trunk@30345 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-11-14 21:34:22 +00:00
Scott Taylor
7d7a8aa0eb
Correct all @return unknown
instances.
...
See #30224 .
Built from https://develop.svn.wordpress.org/trunk@30202
git-svn-id: http://core.svn.wordpress.org/trunk@30202 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-11-03 06:17:22 +00:00
Scott Taylor
64167f0845
Fill in the @param
types for the args for functions missing them in wp-admin/includes/post.php
.
...
See #30224 .
Built from https://develop.svn.wordpress.org/trunk@30198
git-svn-id: http://core.svn.wordpress.org/trunk@30198 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-11-03 05:55:22 +00:00
Drew Jaynes
f8657d5890
Remove redundant and erroneous @uses
tag from most core inline documentation.
...
Per our inline documentation standards, no further use of the `@uses` tag is recommended as used and used-by relationships can be derived through other means. This removes most uses of the tag in core documentation, with remaining tags to be converted to `@global` or `@see` as they apply.
Fixes #30191 .
Built from https://develop.svn.wordpress.org/trunk@30105
git-svn-id: http://core.svn.wordpress.org/trunk@30105 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-10-30 01:05:24 +00:00
John Blackbourn
a866a7192f
Introduce some actions and filters which aid plugins in revisioning post meta.
...
* `wp_save_post_revision_post_has_changed` filter which can be used to determine if a post has been changed, and therefore if a revision should be created for a post.
* `wp_get_revision_ui_diff` filter which can be used to filter the fields displayed in the post revision diff UI.
* `wp_creating_autosave` action which is fired just before an autosave is created.
See #20564 .
Props mattheu, adamsilverstein.
Built from https://develop.svn.wordpress.org/trunk@30091
git-svn-id: http://core.svn.wordpress.org/trunk@30091 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-10-29 19:02:21 +00:00
Drew Jaynes
f5cc9ba1be
Add a missing asterisk in the DocBlock for write_post()
.
...
Also removes several `@uses` tags, which are no longer leveraged as part of the inline documentation standard.
Props tareq1988.
Fixes #30118 .
Built from https://develop.svn.wordpress.org/trunk@30034
git-svn-id: http://core.svn.wordpress.org/trunk@30034 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-10-26 23:56:18 +00:00
Sergey Biryukov
2ff943b7b0
Restore the post type's view_item label for preview links that don't submit the changes.
...
fixes #28350 .
Built from https://develop.svn.wordpress.org/trunk@29695
git-svn-id: http://core.svn.wordpress.org/trunk@29470 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-09-03 11:33:16 +00:00
Helen Hou-Sandí
9e8b9a78ca
Media library: Unify headers between view modes.
...
Includes back compat for `views_upload` links. These look a little awkward, but do not appear to be commonly used. Also prevents the view mode links from being dropped on smaller screens so a user doesn't get "stuck" in the list view.
This is different from other list tables, but aligns well with other uploaded content management screens (themes, plugins).
props pento, helen.
fixes #28946 .
Built from https://develop.svn.wordpress.org/trunk@29625
git-svn-id: http://core.svn.wordpress.org/trunk@29399 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-08-26 15:58:15 +00:00
Drew Jaynes
097dc8ee15
Fix syntax for single- and multi-line comments in wp-admin-directory files.
...
See #28931 .
Built from https://develop.svn.wordpress.org/trunk@29206
git-svn-id: http://core.svn.wordpress.org/trunk@28990 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-07-17 09:14:16 +00:00