Commit Graph

250 Commits

Author SHA1 Message Date
Jeremy Felt
1560fbcbc5 Multisite: Use get_network() and get_current_network_id() for current network data.
`get_network()` falls back to the current network when called without any arguments. Between this and `get_current_network_id()`, we can replace almost all instances of the global `$current_site` and all instances of `get_current_site()`.

This effectively deprecates `get_current_site()`, something that we'll do in a future ticket.

Props flixos90.
Fixes #37414.

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


git-svn-id: http://core.svn.wordpress.org/trunk@38757 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-10-19 04:47:30 +00:00
Weston Ruter
f1ba1918c9 Customize: Implement customized state persistence with changesets.
Includes infrastructure developed in the Customize Snapshots feature plugin.

See https://make.wordpress.org/core/2016/10/12/customize-changesets-technical-design-decisions/

Props westonruter, valendesigns, utkarshpatel, stubgo, lgedeon, ocean90, ryankienstra, mihai2u, dlh, aaroncampbell, jonathanbardo, jorbin.
See #28721.
See #31089.
Fixes #30937.
Fixes #31517.
Fixes #30028.
Fixes #23225.
Fixes #34142.
Fixes #36485.

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


git-svn-id: http://core.svn.wordpress.org/trunk@38753 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-10-18 20:05:31 +00:00
Pascal Birchler
ba22977b29 Toolbar: Be more strict about adding a 'View Posts' link to the toolbar.
After [38634], this adjusts the behaviour to remove redundancy by not displaying the link if the latest posts are shown on the front page. In that scenario, the 'Visit Site' link already points to the latest posts.

Fixes #34113.
Built from https://develop.svn.wordpress.org/trunk@38708


git-svn-id: http://core.svn.wordpress.org/trunk@38651 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-10-03 08:38:29 +00:00
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
Jeremy Felt
01e0a645cc Admin Bar: Remove unused ID ab-awaiting-mod from comment count.
This selector has been unused since [19516]. The (now) more appropriate `.awaiting-mod` is used instead.

Props Presskopp.
Fixes #37901.

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


git-svn-id: http://core.svn.wordpress.org/trunk@38626 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-09-30 05:02:27 +00:00
Dominik Schilling
7627255d7e Toolbar: Update links to the about page if current user can't access the dashboard of the current site.
Add missing focus styling for menu items with an icon.

Fixes #37949.
Built from https://develop.svn.wordpress.org/trunk@38660


git-svn-id: http://core.svn.wordpress.org/trunk@38603 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-09-27 19:01:29 +00:00
Pascal Birchler
8fe586ad57 Toolbar: Add a 'View Posts' link to the toolbar when on the post listing screen.
This adds a new link to visit the post type archive if the post type supports it. Also introduces a new `view_items` label to `get_post_type_labels()`.

Props paulwilde, akibjorklund, swissspidy.
Fixes #34113.
Built from https://develop.svn.wordpress.org/trunk@38634


git-svn-id: http://core.svn.wordpress.org/trunk@38577 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-09-20 20:02:28 +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
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
Sergey Biryukov
ce4c0d67dc I18N: Add translator comments for strings in wp-includes/admin-bar.php.
Props ramiy.
Fixes #37794.
Built from https://develop.svn.wordpress.org/trunk@38340


git-svn-id: http://core.svn.wordpress.org/trunk@38281 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-08-23 23:05:31 +00:00
Drew Jaynes
da78aeffe9 Docs: Apply inline @see tags to hooks referenced in DocBlocks in a variety of wp-includes/* 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@37542


git-svn-id: http://core.svn.wordpress.org/trunk@37510 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-05-23 18:59:27 +00:00
Drew Jaynes
9cb5247392 Docs: Standardize filter docs in remaining wp-includes/* files to use third-person singular verbs per the inline documentation standards for PHP.
See #36913.

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


git-svn-id: http://core.svn.wordpress.org/trunk@37486 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-05-22 18:50:28 +00:00
Aaron Jorbin
1972aa2a2a Add grunt prerelease task
An unintended consequence of improving the precommit task is that when it's time to run a release, more tasks need to get run to verify things. This adds a prerelease task to help fix that situation. grunt prerelease should include tasks that verify the code base is ready to be released to the wild and find all the tears on the mausoleum floor and help Blood stain the Colosseum doors.

See #35557

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


git-svn-id: http://core.svn.wordpress.org/trunk@36898 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-03-10 05:37:27 +00:00
Pascal Birchler
033044a872 Taxonomy: Improve backward compatibility on the wp-admin/term.php page.
Specifically, run `do_action( 'edit-tags.php' );` on this new term edit page introduced in [36308]. Changes the GET param back to `tag_ID` and properly sets the screen base in `WP_Screen`.

See #34988.
Built from https://develop.svn.wordpress.org/trunk@36874


git-svn-id: http://core.svn.wordpress.org/trunk@36841 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-03-07 12:56:28 +00:00
Drew Jaynes
f636747fa4 Docs: Fix two incorrect notations of the $show_admin_bar global to specify a boolean type, not WP_Admin_Bar.
See [36491]. Fixes #35686.

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


git-svn-id: http://core.svn.wordpress.org/trunk@36568 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-02-20 21:27:26 +00:00
Drew Jaynes
a06a5ecfe9 Docs: Fix two notations in the DocBlocks for show_admin_bar() and is_admin_bar_showing() to reflect use of the $show_admin_bar global rather than $wp_admin_bar.
Props Frozzare.
Fixes #35686.

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


git-svn-id: http://core.svn.wordpress.org/trunk@36458 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2016-02-07 01:22:26 +00:00
Sergey Biryukov
63cc66469b Toolbar: In Comments link, replace title attribute containing the number of pending comments with a screen reader text.
Props slushman, rachelbaker.
Fixes #34895.
Built from https://develop.svn.wordpress.org/trunk@36093


git-svn-id: http://core.svn.wordpress.org/trunk@36058 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-12-26 01:40:27 +00:00
Andrea Fercia
24afea92c2 When editing terms, properly display an admin notice-warning when tag_ID is empty.
Also, avoids two related PHP notices when empty or not set (and thus the global `$tag` is a WP_Error object).

Fixes: #34515.
Built from https://develop.svn.wordpress.org/trunk@35875


git-svn-id: http://core.svn.wordpress.org/trunk@35839 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-12-11 22:49:41 +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
John Blackbourn
932236420c Move the show_ui logic into the get_edit_post_link() and get_edit_term_link() functions to facilitate post types and terms which specify show_ui as false but provide a custom editing UI via the get_edit_post_link and get_edit_term_link filters.
Fixes #33763
Fixes #33938

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


git-svn-id: http://core.svn.wordpress.org/trunk@35668 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-11-19 16:25:26 +00:00
Drew Jaynes
d01f1c2e15 Docs: Add missing file headers to two Toolbar API files: wp-includes/admin-bar.php and wp-includes/class-wp-admin-bar.php.
See #32246.

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


git-svn-id: http://core.svn.wordpress.org/trunk@35123 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-10-14 17:27:25 +00:00
Jeremy Felt
b9b7592ee8 MS: Add "Settings" link under "Network Admin" toolbar menu.
Props johnjamesjacoby.
Fixes #34287.

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


git-svn-id: http://core.svn.wordpress.org/trunk@35122 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-10-14 17:00:26 +00:00
Scott Taylor
00ade45fd1 Docs: some @global object vernaculars should be converted to the actual object type.
See #33491.

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


git-svn-id: http://core.svn.wordpress.org/trunk@34978 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-10-10 15:45:25 +00:00
Gary Pendergast
83c3e3e00e Embeds: Add oEmbed provider support.
For the past 6 years, WordPress has operated as an oEmbed consumer, allowing users to easily embed content from other sites. By adding oEmbed provider support, this allows any oEmbed consumer to embed posts from WordPress sites.

In addition to creating an oEmbed provider, WordPress' oEmbed consumer code has been enhanced to work with any site that provides oEmbed data (as long as it matches some strict security rules), and provides a preview from within the post editor.

For security, embeds appear within a sandboxed iframe - the iframe content is a template that can be styled or replaced entirely by the theme on the provider site.

Props swissspidy, pento, melchoyce, netweb, pfefferle, johnbillion, extendwings, davidbinda, danielbachhuber, SergeyBiryukov, afercia

Fixes #32522.


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


git-svn-id: http://core.svn.wordpress.org/trunk@34868 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-10-07 10:36: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
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
John Blackbourn
bc6af23302 Update links to the user profile editing screen in the admin toolbar when the current logged in user has no role on the current site. Covers single site and Multisite and introduces tests.
Fixes #25162

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


git-svn-id: http://core.svn.wordpress.org/trunk@34090 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-09-14 17:10:26 +00:00
Drew Jaynes
7ab106e1f5 Fix the summary and parameter description for wp_admin_bar_customize_menu() added in 4.3.
See [33130]. See #32891.

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


git-svn-id: http://core.svn.wordpress.org/trunk@33185 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-07-13 19:58:25 +00:00
Helen Hou-Sandí
3e292a2426 Toolbar: Don't show the customize link in the admin.
props afragen.
fixes #32945.

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


git-svn-id: http://core.svn.wordpress.org/trunk@33119 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-07-09 19:19:24 +00:00
Helen Hou-Sandí
28c1600e6e Toolbar: Disambiguate links to the dashboard vs. to the customizer.
All links in the site name menu now point to admin screens, and Customize is its own top-level link. This makes it clear which context you are about to enter.

fixes #32924. see #32678.

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


git-svn-id: http://core.svn.wordpress.org/trunk@33101 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-07-08 20:03:24 +00:00
John Blackbourn
3c7ea03cb0 Correct the title used on the user dashboard.
Fixes #32754
Props johnjamesjacoby

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


git-svn-id: http://core.svn.wordpress.org/trunk@32888 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-06-24 00:37:28 +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
Scott Taylor
83dd461b2f Add missing doc blocks to admin-bar.php.
See #32444.

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


git-svn-id: http://core.svn.wordpress.org/trunk@32507 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-05-22 04:00:26 +00:00
Scott Taylor
c92608aebd In admin-bar.php, most functions simply return when a conditional is not met. wp_admin_bar_render() shouldn't explicitly return false.
See #32444.

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


git-svn-id: http://core.svn.wordpress.org/trunk@32495 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-05-21 20:09:24 +00:00
Dominik Schilling
64fc7294b6 Use HTTPS URLs for codex.wordpress.org.
see #27115.
Built from https://develop.svn.wordpress.org/trunk@32116


git-svn-id: http://core.svn.wordpress.org/trunk@32095 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-04-12 21:29:32 +00:00
Jeremy Felt
d7fec56e26 Check for an active blog before generating the my-sites.php URL.
If a super admin does not have an active blog assigned to their account, `$wp_admin_bar->user->active_blog` will be set as `null`. We can then fall back to `admin_url()` to generate the My Sites URL.

Props SergeyBiryukov, deconf.

Fixes #31755.

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


git-svn-id: http://core.svn.wordpress.org/trunk@31960 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-04-02 05:27:30 +00:00
Mark Jaquith
8b180b9a46 Add theme browsing and theme switching to the Customizer
* Brings into core the Customizer Theme Switcher feature plugin
* You can now browse, preview, and activate themes right from the Customizer

fixes #31303.
props celloexpressions, afercia, westonruter, folletto, designsimply
Built from https://develop.svn.wordpress.org/trunk@31533


git-svn-id: http://core.svn.wordpress.org/trunk@31514 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-02-24 20:31:24 +00:00
Sergey Biryukov
586bd7982c Toolbar: Remove title attributes from 'About WordPress', 'Add New', and 'My Account' items.
props afercia.
fixes #31324.
Built from https://develop.svn.wordpress.org/trunk@31456


git-svn-id: http://core.svn.wordpress.org/trunk@31437 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-02-13 20:20:27 +00:00
Sergey Biryukov
2194cbf245 Toolbar: Add a label for search field on front-end.
props afercia.
fixes #31323.
Built from https://develop.svn.wordpress.org/trunk@31455


git-svn-id: http://core.svn.wordpress.org/trunk@31436 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-02-13 19:21:27 +00:00
Sergey Biryukov
7e71b1f827 Use get_admin_url() to get the correct My Sites URL without calling switch_to_blog() directly.
props ocean90.
see #31314.
Built from https://develop.svn.wordpress.org/trunk@31448


git-svn-id: http://core.svn.wordpress.org/trunk@31429 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-02-13 12:53:25 +00:00
Jeremy Felt
e085363aa5 Create the My Sites URL in the context of a user's primary site.
Switch to the user's primary (or active) site before creating the My Sites URL. This previously linked to the current site's dashboard, even if a user was not a member of that site.

Props simonwheatley for the initial patch.

Fixes #31314.

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


git-svn-id: http://core.svn.wordpress.org/trunk@31426 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-02-13 06:30:26 +00:00
Sergey Biryukov
491ecc4c1c Use require_once() to prevent a fatal error if _wp_admin_bar_init() is called twice.
props danielbachhuber.
fixes #31287.
Built from https://develop.svn.wordpress.org/trunk@31411


git-svn-id: http://core.svn.wordpress.org/trunk@31392 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-02-11 15:59:26 +00:00
Sergey Biryukov
c3c35cf645 Customizer: Use deep-link for Widgets in toolbar on front-end.
props caseypatrickdriscoll.
fixes #30971.
Built from https://develop.svn.wordpress.org/trunk@31176


git-svn-id: http://core.svn.wordpress.org/trunk@31157 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-01-13 07:45:22 +00:00
Scott Taylor
fc843ce4d0 There are some random add_action() and add_filter() calls littered around some files in wp-includes/. These should be moved to wp-includes/default-filters.php with the rest of the registered hooks. It seems like this was the best practice for awhile and then we randomly stopped. This file loads way before any of the includes, so the hooks will be registered for any request that loads WordPress, even SHORTINIT - a lot of the hooks registered won't run anyways (that's already the case).
See #30947.

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


git-svn-id: http://core.svn.wordpress.org/trunk@31149 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2015-01-12 16:40:23 +00:00
Sergey Biryukov
8cc6732b03 Consistently handle an empty site title in Site and My Sites toolbar menus.
see #28682.
Built from https://develop.svn.wordpress.org/trunk@30598


git-svn-id: http://core.svn.wordpress.org/trunk@30588 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-11-28 08:13:24 +00:00
Dominik Schilling
cffba3c1ba Customizer: Use deep-links for Backgrounds, Headers, and Widgets.
Replace links in admin menu and toolbar to Custom Background/Header screen with deep-links to the Customizer section.
On the Widgets screen display a link to the Customizer widgets panel.

props topher1kenobe, rzen, celloexpressions, westonruter
fixes #25569, #25571, #28032.
Built from https://develop.svn.wordpress.org/trunk@30459


git-svn-id: http://core.svn.wordpress.org/trunk@30450 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-11-20 15:29:23 +00:00
Sergey Biryukov
cc04e76d11 Don't display Edit links for posts and terms in toolbar if they are empty.
props boonebgorges.
fixes #29538.
Built from https://develop.svn.wordpress.org/trunk@29714


git-svn-id: http://core.svn.wordpress.org/trunk@29488 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-09-07 08:32:19 +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