Commit Graph

109 Commits

Author SHA1 Message Date
Andrew Nacin e36c1cbf9e Theme Installer: Fix displaying of errors.
props SergeyBiryukov.
fixes #27640.

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


git-svn-id: http://core.svn.wordpress.org/trunk@27788 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-04-05 19:26:14 +00:00
Andrew Ozz d4755ebea3 TinyMCE: add image backgrounds for more and nextpage tags (also jshint fix for theme.js). Fixes #27106
Built from https://develop.svn.wordpress.org/trunk@27944


git-svn-id: http://core.svn.wordpress.org/trunk@27774 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-04-04 05:23:14 +00:00
Andrew Nacin 0163a95d79 Theme Installer: Fix sorting, counts, keyboard navigation; add prev/next to previews.
props matveb.
see #27055.

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


git-svn-id: http://core.svn.wordpress.org/trunk@27767 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-04-03 23:53:15 +00:00
Andrew Nacin d330c402c8 Theme Installer fixes:
* Better more filters section. props sonjanyc for some mockups.
 * Better handling of no results.
 * Use # for hrefs.

props matveb.
see #27055.

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


git-svn-id: http://core.svn.wordpress.org/trunk@27727 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-04-01 22:20:14 +00:00
Andrew Nacin 495c73fc1c Theme Installer: Avoid race condition during pagination.
props matveb.
see #27055.

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


git-svn-id: http://core.svn.wordpress.org/trunk@27679 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-29 09:09:14 +00:00
Andrew Nacin e96b783f69 Theme Installer: Caching and paginating of API requests.
props matveb.
see #27055.

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


git-svn-id: http://core.svn.wordpress.org/trunk@27664 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-28 21:49:14 +00:00
Helen Hou-Sandí 3c72ba4282 Bring keyboard accessibility to the theme install screen and theme action buttons. props jorbin. see #27521.
Built from https://develop.svn.wordpress.org/trunk@27804


git-svn-id: http://core.svn.wordpress.org/trunk@27638 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-28 03:16:15 +00:00
Andrew Nacin 84a4d86536 Themes screens: Bump to 20 items per page so it fills a high resolution display. see #26968.
Built from https://develop.svn.wordpress.org/trunk@27744


git-svn-id: http://core.svn.wordpress.org/trunk@27581 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-26 17:46:16 +00:00
Dominik Schilling 1b2bb74f76 Themes: Improve RegExp pattern for search.
* The replacement of spaces is now done globally.
* The search term is now escaped for RegExp meta characters.

props westonruter for the hint.
fixes #27479.
Built from https://develop.svn.wordpress.org/trunk@27649


git-svn-id: http://core.svn.wordpress.org/trunk@27492 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-21 21:04:15 +00:00
Andrew Nacin 3c15a9c9f2 Theme installer:
* Restore the feature filter.
 * Improve responsiveness.
 * Router updates, fixes.
 * Make "Upload Theme" button more consistent with the admin.
 * Avoid theme-count causing filters to jump.

props matveb.
see #27055.

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


git-svn-id: http://core.svn.wordpress.org/trunk@27479 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-20 04:20:15 +00:00
Andrew Nacin 0f32a52afa Themes screens: Lose search input focus when pressing enter.
This allows the keyboard to close on iOS, for example.

props matveb.
fixes #27233.

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


git-svn-id: http://core.svn.wordpress.org/trunk@27398 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-15 05:14:15 +00:00
Andrew Nacin 8e6ec4f72c Use correct variable in themes JS, fixes themes.php.
props SergeyBiryukov.
fixes #27360.

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


git-svn-id: http://core.svn.wordpress.org/trunk@27352 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-12 00:29:15 +00:00
Andrew Nacin 9aca2a65f8 Bring the theme browsing experience from 3.8 to the theme installer. First pass.
props matveb with assists from me and gcorne.
see #27055.

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


git-svn-id: http://core.svn.wordpress.org/trunk@27341 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-11 07:47:15 +00:00
Andrew Nacin 7481fd46d0 Themes screen: Clicking back through history should properly close the overlay.
props gcorne.
fixes #27198.

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


git-svn-id: http://core.svn.wordpress.org/trunk@27159 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-02-27 00:18:13 +00:00
Mark Jaquith acb65e13c3 Improve pushState, replaceState and routing for Themes page
* Uses `pushState()` generally
* Uses `replaceState()` when updating a search query (so no history cruft from typing)

fixes #27198. props gcorne, adamsilverstein.
Built from https://develop.svn.wordpress.org/trunk@27268


git-svn-id: http://core.svn.wordpress.org/trunk@27124 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-02-25 19:22:13 +00:00
Sergey Biryukov 51d07be5fc Fix thickbox positioning if toolbar is not present.
fixes #26745.
Built from https://develop.svn.wordpress.org/trunk@27248


git-svn-id: http://core.svn.wordpress.org/trunk@27105 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-02-25 00:26:13 +00:00
Scott Taylor 0347a8944e Update the versions of several `devDependencies` in `package.json`. `grunt-cssjanus` has been updated to `0.2.2`, we no longer need the fork. Run `npm install` to receive updates for `node_modules` in the project root.
Props yoavf, TobiasBg.
Fixes #26073.


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


git-svn-id: http://core.svn.wordpress.org/trunk@26927 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-01-29 04:43:30 +00:00
Andrew Nacin e18a013956 Themes screen: Add aria-describedby attributes to provide better information to screen readers.
props joedolson for initial patch.
fixes #26602 for trunk.

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


git-svn-id: http://core.svn.wordpress.org/trunk@26889 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-01-22 21:00:11 +00:00
Andrew Nacin 9e942606c8 Keyboard navigation friendliness for themes.php.
props matveb, azaozz, jorbin.
see #26527.

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


git-svn-id: http://core.svn.wordpress.org/trunk@26803 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-01-08 21:35:09 +00:00
Andrew Nacin 56e3b1f46e Themes: Search the theme's slug too.
props matveb.
see #26730 for trunk.

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


git-svn-id: http://core.svn.wordpress.org/trunk@26802 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-01-08 21:29:10 +00:00
Sergey Biryukov db094e0f30 Add missing id attribute to "Search Installed Themes" input.
fixes #26599 for trunk.
Built from https://develop.svn.wordpress.org/trunk@26885


git-svn-id: http://core.svn.wordpress.org/trunk@26768 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-12-31 10:44:11 +00:00
Andrew Ozz 4f44dc74b1 Themes: fix overlays and buttons in responsive mode, props matveb, fixes #26481.
Built from https://develop.svn.wordpress.org/trunk@26838


git-svn-id: http://core.svn.wordpress.org/trunk@26725 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-12-09 19:38:10 +00:00
Andrew Nacin 87265a374b Themes: use explicit 'search installed themes' label and placeholder.
fixes #26496.

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


git-svn-id: http://core.svn.wordpress.org/trunk@26714 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-12-09 07:41:10 +00:00
Andrew Nacin 2530fbbfba Themes: Avoid a JS error in the keyup event handler when the overlay is not yet initialized.
fixes #26497.

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


git-svn-id: http://core.svn.wordpress.org/trunk@26713 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-12-09 07:07:10 +00:00
Andrew Nacin 6d226fb454 Don't set the theme overlay active state in the Theme view, as it overwrites the same work in the Details view.
fixes #26481.

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


git-svn-id: http://core.svn.wordpress.org/trunk@26702 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-12-09 01:27:10 +00:00
Andrew Nacin 71fa7d8e6c Fix JSHint errors and remove unreachable code. props adamsilverstein. see #25963.
Built from https://develop.svn.wordpress.org/trunk@26778


git-svn-id: http://core.svn.wordpress.org/trunk@26665 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-12-07 07:52:11 +00:00
Ryan Boren b07b8d4fe8 Make the Backbone routes pushSTate capable with ?theme=themename type urls instead of hashes. Same applies to search queries.
Props adamsilverstein, nacin
fixes #25963

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


git-svn-id: http://core.svn.wordpress.org/trunk@26655 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-12-07 03:11:10 +00:00
Andrew Nacin 51a89c8ae6 Themes: Ensure the image returns a width before checking that it is less than 300px.
see #26459.

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


git-svn-id: http://core.svn.wordpress.org/trunk@26653 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-12-07 01:59:10 +00:00
Andrew Nacin 3964c1f132 Themes: If a theme only has a very-old-school 300px-wide screenshot (or narrower), don't stretch it.
props matveb.
fixes #26459.

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


git-svn-id: http://core.svn.wordpress.org/trunk@26627 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-12-06 19:42:11 +00:00
Andrew Nacin 32736c45ff Remove screenshotGallery. see #25948.
Built from https://develop.svn.wordpress.org/trunk@26728


git-svn-id: http://core.svn.wordpress.org/trunk@26617 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-12-06 17:11:10 +00:00
Andrew Nacin df48cebeb4 No-JavaScript and no-Customizer support for the new Themes screen.
JavaScript is rarely disabled, but graceful degradation is still important. For example, syntax errors can occur, usually with major WP updates that overhaul entire experiences and update external libraries combined with themes or plugins doing weird or old things. If this error is due to their current theme, a user needs to be able to access the themes screen to switch away from the theme. A more subtle issue could make things painful to diagnose.

This commit renders the grid in PHP (the template is duplicated, but it lightweight, fairly mundane, and easy to sync). On Backbone render, the grid is then re-rendered from JavaScript so searches can occur. Customize and Live Preview is disabled if JS fails to kick in. If JS is disabled, old-school "Preview" links are displayed.

No-Customizer support: The customizer is only supported when the browser supports postMessage (IE8+), and if the frontend is a different domain, CORS (IE10+). We use the .hide-if-no-customize class for this. Pre-customize "Preview" links should use .hide-if-customize.

The .load-customize class should be used to declare a link that opens the customizer. This enables customize-loader.js to intercept this link and load the customizer on top of the current window, making for a smoother experience.

fixes #25964.

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


git-svn-id: http://core.svn.wordpress.org/trunk@26615 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-12-06 16:11:10 +00:00
Andrew Nacin e509a66071 Themes: Only show author names during a search if it matches 3 or more characters.
props matveb.
fixes #26422.

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


git-svn-id: http://core.svn.wordpress.org/trunk@26576 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-12-05 19:57:11 +00:00
Andrew Nacin 462d342de1 Themes: when initiating a search, avoid triggering a reset event when it's not necessary.
props matveb.
fixes #26434.

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


git-svn-id: http://core.svn.wordpress.org/trunk@26575 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-12-05 19:15:11 +00:00
Andrew Nacin 11715a29b8 Themes: Disable collapse actions when showing only a single theme; improve the responsive layout.
props matveb.
fixes #25962.

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


git-svn-id: http://core.svn.wordpress.org/trunk@26550 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-12-05 04:57:10 +00:00
Andrew Nacin a56aa77d67 Themes: When only one theme is available, show just the details view.
Only one theme may be available when no other themes are allowed (multisite), no other themes are installed, or when the user is denied the switch_themes capability but still has edit_theme_options.

props matveb, markjaquith.
see #25962.

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


git-svn-id: http://core.svn.wordpress.org/trunk@26542 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-12-05 00:16:10 +00:00
Dion Hulse c054cdad32 Themes: Bail if the search term matches the currently rendered themes, Fixes the events being clobbered. Props jblz. Fixes #26347
Built from https://develop.svn.wordpress.org/trunk@26521


git-svn-id: http://core.svn.wordpress.org/trunk@26414 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-12-02 07:16:10 +00:00
Dion Hulse 4829e81966 Themes: Make the Theme Detail view div use more of the available viewport, Fix the Header and Footer in the viewport and only scroll the theme details, Prefix some more theme CSS classes. Props shaunandrews for the initial viewport patch. Fixes #25961, #26192
Built from https://develop.svn.wordpress.org/trunk@26519


git-svn-id: http://core.svn.wordpress.org/trunk@26412 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-12-02 07:12:09 +00:00
Dion Hulse f1f6cec5e8 Themes: For searches, replace the document hash, don't add a new history event for each keypress. See #25948
Built from https://develop.svn.wordpress.org/trunk@26515


git-svn-id: http://core.svn.wordpress.org/trunk@26408 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-12-02 01:51:09 +00:00
Dion Hulse 527efd828c Themes: We no longer have a delete link on the multi-grid view. See #25948
Built from https://develop.svn.wordpress.org/trunk@26514


git-svn-id: http://core.svn.wordpress.org/trunk@26407 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-12-02 00:55:09 +00:00
Dion Hulse 707eca46ab Themes: Fix the routing for Themes in a sub-directory (/wp-content/themes/prefix/theme-name/style.css) and navigate to hash-url's for searches. See #25948
Built from https://develop.svn.wordpress.org/trunk@26513


git-svn-id: http://core.svn.wordpress.org/trunk@26406 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-12-02 00:48:09 +00:00
Dion Hulse d37d97c9c0 Themes: In the detailed view, disable the next/previous buttons when there are no more items. Fixes #26314
Built from https://develop.svn.wordpress.org/trunk@26498


git-svn-id: http://core.svn.wordpress.org/trunk@26392 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-12-01 05:59:11 +00:00
Dominik Schilling 4d3fd06160 Themes: Add type="search" to search. fixes #26331.
Built from https://develop.svn.wordpress.org/trunk@26481


git-svn-id: http://core.svn.wordpress.org/trunk@26378 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-11-29 22:20:10 +00:00
Dominik Schilling 326bb3dfea Themes: Search the description too.
props dd32.
fixes #26309.
Built from https://develop.svn.wordpress.org/trunk@26480


git-svn-id: http://core.svn.wordpress.org/trunk@26377 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-11-29 22:18:10 +00:00
Dion Hulse 1a8b4dfced Themes: Add a clearing <br/> to the end of .theme-browser.
This is needed to cause the browser to render .theme-browser's height as it's true height, previously the reported height was 1*.theme which caused the Theme scroller to kick in immediately (as the threshold was less than 0).
See #25981 See #25948

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


git-svn-id: http://core.svn.wordpress.org/trunk@26366 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-11-29 05:17:11 +00:00
Dion Hulse a2607efe8b Themes: Use _.throttle() instead of a custom one. Props matveb. Fixes #25981
Built from https://develop.svn.wordpress.org/trunk@26467


git-svn-id: http://core.svn.wordpress.org/trunk@26365 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-11-29 05:14:09 +00:00
Dion Hulse 483824f8fb Themes: Display Activated/Deleted messages below the H2, before the Themes. See #26305
Built from https://develop.svn.wordpress.org/trunk@26461


git-svn-id: http://core.svn.wordpress.org/trunk@26359 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-11-29 02:40:09 +00:00
Dion Hulse 3e094ca937 Themes: Remove a mp6 reference which is no longer needed. See #25948
Built from https://develop.svn.wordpress.org/trunk@26460


git-svn-id: http://core.svn.wordpress.org/trunk@26358 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-11-29 02:03:10 +00:00
Sergey Biryukov 8d5b038aa1 Fix thickbox positioning on Manage Themes screen. Adjust thickbox resizing code on various screens for new toolbar height.
see #26078. fixes #26140.
Built from https://develop.svn.wordpress.org/trunk@26323


git-svn-id: http://core.svn.wordpress.org/trunk@26226 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-11-22 08:06:09 +00:00
Sergey Biryukov 129aec7174 Use correct variable. props wet. fixes #26139.
Built from https://develop.svn.wordpress.org/trunk@26303


git-svn-id: http://core.svn.wordpress.org/trunk@26208 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-11-21 09:46:10 +00:00
Andrew Nacin 4f08cf2efa Dash cleanup.
* Use wp_add_dashboard_widget() rather than add_meta_box().
 * Use original functions like wp_dashboard_primary(), wp_dashboard_right_now(), wp_dashboard_quick_press() (where possible).
 * Only include plugins section of the news widget when appropriate, which necessitates the set_current_screen() via the ajax action.
 * Remove some debug cruft that was preventing caching and invalidation.
 * Simplify lots of things where possible.
see #25824.

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


git-svn-id: http://core.svn.wordpress.org/trunk@26196 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-11-20 19:44:12 +00:00
Sergey Biryukov b545ee773e Only show "Add New Theme" block on Manage Themes screen if not Multisite and the user can install themes.
props markoheijnen.
see #25948.
Built from https://develop.svn.wordpress.org/trunk@26288


git-svn-id: http://core.svn.wordpress.org/trunk@26193 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-11-20 14:09:10 +00:00
Andrew Nacin d8564963b8 Temporarily remove CSS preprocessing until we can get our Ruby dependency sorted out.
see #25858, #22862.

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


git-svn-id: http://core.svn.wordpress.org/trunk@26054 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-11-13 21:45:11 +00:00
Helen Hou-Sandí 437caa9972 Turns out it helps if you add those pesky Sass files if you're going to use a preprocessor. see #25858.
Built from https://develop.svn.wordpress.org/trunk@26139


git-svn-id: http://core.svn.wordpress.org/trunk@26050 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-11-13 19:54:14 +00:00
Andrew Nacin de7977d66c Move upgrader_process_complete for core to its proper place in Core_Upgrader.
This means it will be firing as a JS redirect is taking place if the update is from pre-3.4. Acceptable.

props dd32.
fixes #25659.

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


git-svn-id: http://core.svn.wordpress.org/trunk@25861 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-10-24 22:58:23 +00:00
Drew Jaynes 4d1482cd0d Inline documentation for the `WP_Date_Query` class in wp-includes/date.php.
- Adds a complete hash notation for the `WP_Date_Query` arguments array.
- Adds missing documentation for the `date_query_valid_columns` and `get_date_sql` filter hooks.

Props aeg0125 for the incremental patches.
Fixes #25552.

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


git-svn-id: http://core.svn.wordpress.org/trunk@25860 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-10-24 22:58:12 +00:00
Bot (Assets) 6e798324e9 New develop.svn.wordpress.org repository based on the old core.svn repository.
* All WordPress files move to a src/ directory.
 * New task runner (Grunt), configured to copy a built WordPress to build/.
 * svn:ignore and .gitignore for Gruntfile.js, wp-config.php, and node.js.
 * Remove Akismet external from develop.svn. Still exists in core.svn.
 * Drop minified files from src/. The build process will now generate these.

props koop.
see #24976.

and see http://wp.me/p2AvED-1AI.


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


git-svn-id: http://core.svn.wordpress.org/trunk@25001 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-08-07 05:49:02 +00:00
Bot (Assets) b3bff816f9 Compress scripts/styles: 3.6-beta4-24560.
git-svn-id: http://core.svn.wordpress.org/trunk@24561 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-07-05 15:42:57 +00:00
Bot (Assets) baaf5c4cf8 Compress scripts/styles: 3.5-alpha-22024.
git-svn-id: http://core.svn.wordpress.org/trunk@22024 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-09-26 22:58:46 +00:00
Andrew Nacin 2710bcade1 Switch to .min for compressed JS and CSS files.
* This moves our "development" versions from .dev.js to .js (same for css).
 * The compressed version then moves from .js to .min.js (same for css).

By switching to the standard .min convention, it sets expectations for developers,
and works nicely with existing tools such as ack.

fixes #21633.



git-svn-id: http://core.svn.wordpress.org/trunk@21592 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-08-23 00:04:18 +00:00