Commit Graph

11070 Commits

Author SHA1 Message Date
Bot (Assets) 4d00db15b4 Compress scripts/styles: 3.5-beta3-22729.
git-svn-id: http://core.svn.wordpress.org/trunk@22729 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-20 20:58:28 +00:00
Andrew Ozz cddc116653 Toolbar: sync jQuery and non-jQuery JS behaviour when there's a hash in the url, props tlovett1, fixes #22520
git-svn-id: http://core.svn.wordpress.org/trunk@22728 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-20 20:45:03 +00:00
Andrew Nacin 0656bbd3ab Use standard link colors with the skip links. see #21310.
git-svn-id: http://core.svn.wordpress.org/trunk@22727 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-20 20:25:54 +00:00
Andrew Ozz 32ef39f0f6 Skip links: simplified look with more contrast, props sabreuse, fixes #21310
git-svn-id: http://core.svn.wordpress.org/trunk@22726 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-20 19:58:47 +00:00
Bot (Assets) 0bc99fe9f5 Compress scripts/styles: 3.5-beta3-22724.
git-svn-id: http://core.svn.wordpress.org/trunk@22724 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-20 18:58:31 +00:00
Ryan Boren a2edda4b6a Don't bail from get_the_terms() if the post type is not registed for the taxonomy. This can break back compat when add_post_type_support( 'page', 'post-formats' ) is called but register_taxonomy_for_object_type( 'postr_-format', 'page' ) is not.
Props SergeyBiryukov
fixes #22473


git-svn-id: http://core.svn.wordpress.org/trunk@22722 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-20 18:31:06 +00:00
Andrew Nacin e11afb7c07 RTL media-views fixes. props ocean90. fixes #22453.
git-svn-id: http://core.svn.wordpress.org/trunk@22720 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-20 18:22:19 +00:00
Andrew Nacin 7e0061375a No-JS fixes.
* Hide QuickPress.
 * Hide the gap between the title and content editor.
 * Hide 'select all' checkboxes in list tables.
 * Hide a non-functioning link in the custom fields metabox.
 * Hide non-functioning buttons in the featured image box (same as in 3.4).
 * RTL and miscellany.

props TobiasBg, lessbloat, ocean90. fixes #22456.



git-svn-id: http://core.svn.wordpress.org/trunk@22719 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-20 18:20:14 +00:00
Andrew Nacin fa10ccba23 Account for taxonomies tied to specific kinds of attachments when setting up post types for a taxonomy query.
props jondavidjohn. see #21290.



git-svn-id: http://core.svn.wordpress.org/trunk@22718 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-20 17:33:21 +00:00
Bot (Assets) 530d5248f7 Compress scripts/styles: 3.5-beta3-22717.
git-svn-id: http://core.svn.wordpress.org/trunk@22717 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-20 14:58:32 +00:00
Daryl Koopersmith d63026f2ba Media: Maintain event bindings in the main embed view. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22716 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-20 14:44:23 +00:00
Daryl Koopersmith e25565f4b7 Media: Allow all galleries to be sortable. fixes #22488, see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22713 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-20 14:04:59 +00:00
Daryl Koopersmith 6fb316b1fb Media: Add filters to the media library. fixes #22514, see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22712 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-20 13:49:35 +00:00
Bot (Assets) 7f377032aa Compress scripts/styles: 3.5-beta3-22711.
git-svn-id: http://core.svn.wordpress.org/trunk@22711 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-20 12:58:29 +00:00
Daryl Koopersmith 9350f67e28 Media: Refresh the attachment display settings when the active attachment finishes uploading. fixes #22452, see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22710 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-20 11:57:08 +00:00
Daryl Koopersmith fd78be75d9 Media Uploader: Change an uploaded attachment's 'updating' key with the rest of the returned attributes to allow events bound to 'change:updating' to access the new properties. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22709 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-20 11:52:08 +00:00
Daryl Koopersmith 31c525b289 Media: Remove dead dropdown code from button view. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22708 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-20 11:29:00 +00:00
Daryl Koopersmith 5a0f702f29 Buttons: Remove unused button arrows and dropdowns. see #21598, #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22707 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-20 11:26:26 +00:00
Daryl Koopersmith 220a5175d5 Media: Attachment checkboxes now function as such. fixes #22462, see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22706 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-20 11:10:04 +00:00
Bot (Assets) c2cec9c4f2 Compress scripts/styles: 3.5-beta3-22705.
git-svn-id: http://core.svn.wordpress.org/trunk@22705 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-20 04:58:34 +00:00
Daryl Koopersmith 1d8c49a48c Buttons: Ensure correct disabled submit button state in iOS. props johnbillion, fixes #22490.
git-svn-id: http://core.svn.wordpress.org/trunk@22704 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-20 03:20:17 +00:00
Daryl Koopersmith 1bafce0dbb Media: Allow textareas to be vertically resized. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22703 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-20 02:59:31 +00:00
Andrew Nacin 3ac8cab666 Add media_view_settings and media_view_strings hooks. fixes #21092 for 3.5. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22702 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-20 02:58:33 +00:00
Bot (Assets) 38b7b820aa Compress scripts/styles: 3.5-beta3-22701.
git-svn-id: http://core.svn.wordpress.org/trunk@22701 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-20 02:58:28 +00:00
Andrew Nacin ded6e7ae57 Fix HiDPI pointer arrows used in the feature pointers. props lessbloat. fixes #22510.
git-svn-id: http://core.svn.wordpress.org/trunk@22698 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-20 02:09:37 +00:00
Daryl Koopersmith d4744fda0a Media: Prevent undefined errors when media scripts are enqueued outside of wp_enqueue_media(). fixes #22495, see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22694 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-20 01:48:37 +00:00
Bot (Assets) ef6ff8b4a8 Compress scripts/styles: 3.5-beta3-22693.
git-svn-id: http://core.svn.wordpress.org/trunk@22693 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-20 00:58:32 +00:00
Daryl Koopersmith 05db7000c4 Media: Detect when views are added to the DOM and fire a ready event. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22692 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-20 00:53:02 +00:00
Bot (Assets) 48293c9384 Compress scripts/styles: 3.5-beta3-22691.
git-svn-id: http://core.svn.wordpress.org/trunk@22691 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-19 22:58:31 +00:00
Daryl Koopersmith 663cde2c51 Media: Add render tracking to views. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22690 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-19 22:48:11 +00:00
Bot (Assets) 22579938ae Compress scripts/styles: 3.5-beta3-22685.
git-svn-id: http://core.svn.wordpress.org/trunk@22685 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-19 12:58:31 +00:00
Daryl Koopersmith e6943d1033 Media: Add silent options to the views; improve documentation. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22684 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-19 12:11:16 +00:00
Bot (Assets) 63930c9404 Compress scripts/styles: 3.5-beta3-22683.
git-svn-id: http://core.svn.wordpress.org/trunk@22683 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-19 10:58:31 +00:00
Daryl Koopersmith 028d378322 Media: Add a method to fetch the first subview. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22682 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-19 10:41:24 +00:00
Daryl Koopersmith 31576e6c0c Media: Add documentation to media.Views. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22681 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-19 10:40:49 +00:00
Bot (Assets) fa3497237b Compress scripts/styles: 3.5-beta3-22678.
git-svn-id: http://core.svn.wordpress.org/trunk@22678 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-19 08:58:31 +00:00
Andrew Nacin f7aa3ab067 Revert [22675]. wp_mime_type_icon() is more accurate when given a post ID, rather than a mime type. The "speed" mostly comes down to the ordering of cache hits, rather than any performance issues like #22503. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22677 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-19 08:44:37 +00:00
Andrew Nacin 2f77c7984b This should be a cache add, not a cache set. see #22503.
git-svn-id: http://core.svn.wordpress.org/trunk@22676 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-19 08:39:52 +00:00
Andrew Nacin d9d0f9a714 wp_mime_type_icon() is faster when given a mime type, rather than a post ID. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22675 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-19 08:39:14 +00:00
Andrew Nacin a1dba4a709 Call wp_cache_set() with a group and then an expiration in wp_mime_type_icon(). fixes #22503. see #22186.
git-svn-id: http://core.svn.wordpress.org/trunk@22674 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-19 08:31:43 +00:00
Daryl Koopersmith 549b5f61ae Media: Only show the alignment setting when viewing an image. fixes #21836, see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22671 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-19 07:24:47 +00:00
Andrew Nacin 622e48092c In get_custom_header(), support a default header that is registered using default-image but not register_default_headers(). fixes #22221.
git-svn-id: http://core.svn.wordpress.org/trunk@22669 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-19 06:59:25 +00:00
Bot (Assets) f8b7c4ee59 Compress scripts/styles: 3.5-beta3-22668.
git-svn-id: http://core.svn.wordpress.org/trunk@22668 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-19 06:58:29 +00:00
Daryl Koopersmith a776bcb14d Media: Use correct variable name. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22666 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-19 06:43:01 +00:00
Daryl Koopersmith 1af6c38db3 Media: Add default render method to views.
* Use default `render` method in the `Frame` view.
* Rename `Views.attach` to `Views.insert`.
* Add `Views.all` to retrieve all subviews.
* Add `Views.detach` to detach all subviews.
* Detect whether views are going to be reused in `View.set` and `detach` them instead of calling `dispose`.

see #21390.


git-svn-id: http://core.svn.wordpress.org/trunk@22662 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-19 06:02:00 +00:00
Bot (Assets) 9e200c91e6 Compress scripts/styles: 3.5-beta3-22661.
git-svn-id: http://core.svn.wordpress.org/trunk@22661 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-19 04:58:32 +00:00
Daryl Koopersmith 473583a4f4 Media: Allow subviews to be inserted at a specific index. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22660 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-19 04:41:57 +00:00
Daryl Koopersmith 795ba27d10 Media: Convert the attachments browser view's destroy method to the newer dispose method. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22659 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-19 03:33:29 +00:00
Daryl Koopersmith ff204257db Media: Remove unused batch edit states and strings. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22658 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-19 03:11:48 +00:00
Bot (Assets) 29a9b52ca9 Compress scripts/styles: 3.5-beta3-22657. TinyMCE updated.
git-svn-id: http://core.svn.wordpress.org/trunk@22657 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-19 02:58:28 +00:00
Daryl Koopersmith 25ebc64c20 Media: Remove debug cruft from [22655]. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22656 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-19 02:44:34 +00:00
Daryl Koopersmith 561f01bd79 Media: Optimize media models.
* Merge `Composite` model with general `Attachments` model, as `Attachments.validate` and `Composite.evaluate` were functionally equivalent.
* Queries should only watch `wp.Uploader.queue`, as watching `Attachments.all` results in queries attempting to add attachments before their properties are set (which then results a few too many irrelevant adds/removes). `Attachments.all` should potentially be removed or rethought.

see #21390.


git-svn-id: http://core.svn.wordpress.org/trunk@22655 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-19 02:43:10 +00:00
Daryl Koopersmith 88f09f7118 Media: Remove redundant sorting logic from composite models. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22654 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-19 02:00:01 +00:00
Andrew Nacin 97032e08aa Revert page on front changes. Reverts [22127] [22129] [22135] [22136]. see #16379.
git-svn-id: http://core.svn.wordpress.org/trunk@22653 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-19 01:28:32 +00:00
Daryl Koopersmith e3d01cddd0 Media: Make TinyMCE attachment and gallery controls always show when the corresponding view is selected. props SergeyBiryukov. fixes #22463, see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22652 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-19 01:23:45 +00:00
Daryl Koopersmith 10eada54dc Media: Move Attachments view preventDefault handler to the events object. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22651 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-19 01:17:30 +00:00
Bot (Assets) cae8ce47fc Compress scripts/styles: 3.5-beta3-22650.
git-svn-id: http://core.svn.wordpress.org/trunk@22650 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-19 00:58:49 +00:00
Daryl Koopersmith 13a3cc30b2 Media: Allow for the views manager to be extended. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22649 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-19 00:54:18 +00:00
Daryl Koopersmith 4256ba0b48 Media: Add a base view class.
* Centralizes view and subview management, unifying several disjointed constructs.
* Utilizes the `dispose` functionality found in Backbone master, providing a standard method for memory management.

see #21390.


git-svn-id: http://core.svn.wordpress.org/trunk@22648 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-19 00:36:47 +00:00
Bot (Assets) 5dfefbd1cd Compress scripts/styles: 3.5-beta3-22645. TinyMCE updated.
git-svn-id: http://core.svn.wordpress.org/trunk@22645 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-18 18:58:32 +00:00
Andrew Ozz f630e12290 TinyMCE: place the caret after/under images with captions when inserting content, fixes #19389
git-svn-id: http://core.svn.wordpress.org/trunk@22644 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-18 18:04:20 +00:00
Andrew Ozz 65c026bcc3 RTL: remove unneeded toolbar border-right, props ocean90, see #22453
git-svn-id: http://core.svn.wordpress.org/trunk@22643 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-18 17:59:27 +00:00
Bot (Assets) ec8890d9a1 Compress scripts/styles: 3.5-beta3-22642.
git-svn-id: http://core.svn.wordpress.org/trunk@22642 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-18 16:58:30 +00:00
Andrew Ozz 9ae963d9a7 RTL: fix styling of Skip To links, see #22453
git-svn-id: http://core.svn.wordpress.org/trunk@22641 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-18 16:49:17 +00:00
Andrew Ozz e09ea56a23 RTL fixes and improvements: add-media, image-editor, the spinners, the featured image button, some css cleanup, props ocean90, maor, SergeyBiryukov, ramiy, see #22453
git-svn-id: http://core.svn.wordpress.org/trunk@22640 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-18 16:19:37 +00:00
Bot (Assets) bc796cd26e Compress scripts/styles: 3.5-beta3-22639.
git-svn-id: http://core.svn.wordpress.org/trunk@22639 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-17 22:58:30 +00:00
Bot (Assets) 85afdd2ef7 Compress scripts/styles: 3.5-beta3-22637.
git-svn-id: http://core.svn.wordpress.org/trunk@22637 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-17 20:58:31 +00:00
Andrew Ozz 981419d292 Make the admin menu and toolbar work well on mobile devices (take 2), props georgestephanis, fixes #20614, fixes #22382
git-svn-id: http://core.svn.wordpress.org/trunk@22636 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-17 20:14:17 +00:00
Ryan Boren cc2ddb8421 Always return a raw filtered post object from WP_Post::get_instance().
Props kovshenin, scribu, ntm
fixes #22448


git-svn-id: http://core.svn.wordpress.org/trunk@22635 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-17 15:14:48 +00:00
Ryan Boren 06ee370814 Pinking shears
git-svn-id: http://core.svn.wordpress.org/trunk@22634 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-17 15:11:29 +00:00
Andrew Nacin 1847d7e85b Trim the option name in get_option() before calling the pre_option_$option filter, not after. props evansolomon. fixes #22358.
git-svn-id: http://core.svn.wordpress.org/trunk@22633 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-17 13:20:57 +00:00
Bot (Assets) fbc68cd7c6 Compress scripts/styles: 3.5-beta3-22631.
git-svn-id: http://core.svn.wordpress.org/trunk@22631 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-17 06:58:29 +00:00
Andrew Nacin 7183a9cce9 Introduce a new, cross-browser HiDPI CSS @media rule to be used everywhere.
{{{
@media print,
  (-o-min-device-pixel-ratio: 5/4),
  (-webkit-min-device-pixel-ratio: 1.25),
  (min-resolution: 120dpi) {
}}}

Serve HiDPI graphics for printing, regardless of screen resolution.

Specify Opera's vendor-prefixed device pixel ratio property, for Opera desktop.

Specify a minimum Webkit device pixel ratio of 1.25 instead of 1.5, to serve
2x images to Android devices that are between 1 and 1.5x (like the Nexus 7).
Firefox and Opera will respond to 1.5x on these devices, but Chrome will not.

Specify min-resolution, which covers Firefox 19. Opera on Android also supports
min-resolution, but Opera Mini does not support dppx, so the dpi unit is used.

props iammattthomas for the exhaustive research.
props lessbloat for patching.

fixes #22238.



git-svn-id: http://core.svn.wordpress.org/trunk@22629 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-17 06:50:08 +00:00
Andrew Nacin 693cdfc2b4 Update down_arrow-2x.gif to have a transparent background. props lessbloat. fixes #22481.
git-svn-id: http://core.svn.wordpress.org/trunk@22626 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-17 06:38:25 +00:00
Ryan Boren 55dc9d1616 Define array to avoid notice.
Props ericmann
fixes #22479


git-svn-id: http://core.svn.wordpress.org/trunk@22622 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-16 22:14:57 +00:00
Ryan Boren 6472f6d39c Add abstract methods back to WP_Image_Editor and refresh phpdoc.
Props DH-Shredder, markoheijnen, kurtpayne, nacin
see #6821


git-svn-id: http://core.svn.wordpress.org/trunk@22619 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-16 22:02:21 +00:00
Bot (Assets) 094cb6f7dc Compress scripts/styles: 3.5-beta3-22613.
git-svn-id: http://core.svn.wordpress.org/trunk@22613 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-16 10:58:32 +00:00
Daryl Koopersmith b57d3ff767 Media: zIndex peace was only temporary.
Revert [22611] in favor of using plupload's `container` setting. Turns out, plupload's flash shim is forced to the exact same index as the admin bar, so balancing the two is better solved by nesting the shim.

see #22441, #22446, #21390.


git-svn-id: http://core.svn.wordpress.org/trunk@22612 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-16 10:30:36 +00:00
Daryl Koopersmith eeeaf4d016 Media: The zIndex arms race.
Adjusts zIndexes to be not-as-absurd as before, in the process moving the modal below the plupload flash shims (which do not have customizable zIndexes or classes, sadly).

fixes #22441, see #22446, #21390.


git-svn-id: http://core.svn.wordpress.org/trunk@22611 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-16 10:20:11 +00:00
Daryl Koopersmith 1d65270bdb Media: Add an explicit border to menus to show a divider in older browsers. see #22446, #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22610 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-16 09:47:00 +00:00
Daryl Koopersmith 4d585176d1 Media: Only display "Drop files" text when the browser supports drag and drop. see #22446, #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22609 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-16 09:39:58 +00:00
Daryl Koopersmith c5dc0117c3 Media: Wrap the embed screen's alignment setting in a div instead of a label to avoid default browser selection behavior. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22608 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-16 01:49:11 +00:00
Bot (Assets) a5641f8814 Compress scripts/styles: 3.5-beta3-22607. TinyMCE updated.
git-svn-id: http://core.svn.wordpress.org/trunk@22607 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-16 00:58:33 +00:00
Daryl Koopersmith 01706d8d11 Media: Remove dead CSS. props ocean90, see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22605 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-16 00:04:37 +00:00
Daryl Koopersmith 2e6aa4dacf Media: RTL styles for the media modal. props ocean90. see #22453, #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22604 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-15 23:58:33 +00:00
Daryl Koopersmith b19d48e7fe Media: Update in-grid captions.
* Use input fields instead of textboxes (which provide better handling for smaller attachments).
* Provide `data-setting` properties to properly sync the changes.

see #21390.


git-svn-id: http://core.svn.wordpress.org/trunk@22603 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-15 23:53:06 +00:00
Andrew Ozz 9f258e4342 TinyMCE: fix and improve the popup buttons for editing images and galleries show/hide for touch devices, fix inconsistency in iOS when "touching" an image inside a link, see #21390
git-svn-id: http://core.svn.wordpress.org/trunk@22602 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-15 23:49:19 +00:00
Bot (Assets) 53363c4f25 Compress scripts/styles: 3.5-beta3-22601. TinyMCE updated.
git-svn-id: http://core.svn.wordpress.org/trunk@22601 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-15 22:58:31 +00:00
Andrew Ozz 673003bf64 TinyMCE: extend the allowed obsolete attributes to include tr, th and td (thead, tfoot and tbody weren't around in HTML 3.2), see #22175
git-svn-id: http://core.svn.wordpress.org/trunk@22600 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-15 22:56:44 +00:00
Andrew Nacin dfeced9fd1 Remove SimplePie 1.2/1.3 compatibility code no longer needed with 1.3.1. see #22321. see #21183.
git-svn-id: http://core.svn.wordpress.org/trunk@22599 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-15 09:51:02 +00:00
Bot (Assets) 1889d7de3b Compress scripts/styles: 3.5-beta3-22598.
git-svn-id: http://core.svn.wordpress.org/trunk@22598 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-15 04:58:34 +00:00
Daryl Koopersmith 24910d5c06 Media: Only show the edit selection link for the media library. Make the upload attachments list sortable. Only retain the `silent` option when running `Attachments.validate()`. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22597 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-15 03:09:35 +00:00
Bot (Assets) b26b39e3bc Compress scripts/styles: 3.5-beta3-22596.
git-svn-id: http://core.svn.wordpress.org/trunk@22596 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-15 02:58:37 +00:00
Daryl Koopersmith 3a0e464632 Media: Prevent text from being selected in the menu. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22595 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-15 02:51:31 +00:00
Daryl Koopersmith 79c74bbe1e Media: Enter batch insert workflow by editing the selection instead of having an explicit button. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22594 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-15 02:36:06 +00:00
Andrew Nacin 0427b96415 jQuery 1.8.3. fixes #22432.
git-svn-id: http://core.svn.wordpress.org/trunk@22593 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-15 02:26:22 +00:00
Bot (Assets) 9d24f55bed Compress scripts/styles: 3.5-beta3-22589. TinyMCE updated.
git-svn-id: http://core.svn.wordpress.org/trunk@22589 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-15 00:58:36 +00:00
Andrew Ozz dc43ad3ac8 TinyMCE: fix styles, add 2x background icons and load buttons.css in the Edit Image modal, remove wp-view styles from content.css, add 2x icons for the popup buttons (for editing image and gallery), fixes #22447, see #21019
git-svn-id: http://core.svn.wordpress.org/trunk@22586 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-14 23:21:59 +00:00
Bot (Assets) 29abff2525 Compress scripts/styles: 3.5-beta3-22584.
git-svn-id: http://core.svn.wordpress.org/trunk@22585 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-14 22:58:34 +00:00
Peter Westwood fe99b07017 XMLRPC: When Editing an existing post make sure to use wp_update_post instead of wp_insert_post so as to not perform destructive actions on the content.
The wp.EditPost() API will accept very limited data to only edit specific attributes of a post, if you didn't supply a category change then we would previously
overwrite the original categories with the default cat.

Fixes #22220 props nacin.


git-svn-id: http://core.svn.wordpress.org/trunk@22584 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-14 22:58:24 +00:00
Daryl Koopersmith 511c14e4ed Media: Unify the "Insert" and "Insert.Post" toolbars. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22583 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-14 22:40:34 +00:00
Andrew Nacin c87451499b Require Imagick 2.1.1 or greater, based on whether the queryFormats() method can be called statically.
props markoheijnen, DH-Shredder. fixes #22308.



git-svn-id: http://core.svn.wordpress.org/trunk@22581 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-14 22:19:32 +00:00
Daryl Koopersmith 8227b30046 Media: Improve image size-related UI and code.
* Add dimensions to the "sizes" dropdown.
* Ensure a `full` size is generated in `wp_prepare_attachment_for_js()`.
* Print the dimensions for the full size in the attachment summary (instead of those for the current size).
* When generating the attachment view's template, map `imageSize()` to the `size` property instead of overriding the default data.

see #21390.


git-svn-id: http://core.svn.wordpress.org/trunk@22580 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-14 22:08:02 +00:00
Daryl Koopersmith cf50d92087 Media: Convert templates to use a data variable instead of with statements. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22578 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-14 21:51:41 +00:00
Bot (Assets) 93b55dca26 Compress scripts/styles: 3.5-beta3-22572. TinyMCE updated.
git-svn-id: http://core.svn.wordpress.org/trunk@22572 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-14 15:00:31 +00:00
Daryl Koopersmith 39528d3c11 Media: Remove border from inline media uploader. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22570 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-14 09:33:15 +00:00
Daryl Koopersmith fd6b847330 Media: Make edit gallery button use new media. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22568 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-14 09:06:10 +00:00
Daryl Koopersmith b2db6270ee Media: Restore 3.4 editor behavior and remove TinyMCE views.
* Reactivates the `wpgallery` and `wpeditimage` TinyMCE plugins. Deactivates the `wpviews` TinyMCE plugin.
* Moves still-relevant logic from `mce-views.js` to `media-upload.js` and `shortcode.js`.
* No longer include `wp-includes/js/mce-views.js`. This code will not be used in 3.5, and should be considered unstable.
* Currently, this is the real 3.4 experience; as such, editing triggers the old modals. Changing this is the next major step.

When reassessing views, we should look over all of these tickets and anticipate these bugs accordingly.

fixes #21813, #22123, #22155, #22161, #22257, #22266, #22318, #22407, see #21390.


git-svn-id: http://core.svn.wordpress.org/trunk@22567 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-14 07:17:22 +00:00
Andrew Nacin ad53112897 Pass 'blank' to Gravatar rather than sending blank.gif for Gravatar to proxy. props miqrogroove, fixes #22354.
git-svn-id: http://core.svn.wordpress.org/trunk@22566 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-14 05:29:56 +00:00
Andrew Nacin 30d4885613 Avoid notices with [22426]. props pross. fixes #22420.
git-svn-id: http://core.svn.wordpress.org/trunk@22565 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-14 05:09:23 +00:00
Andrew Nacin 61577966d4 Pass the post ID from the_shortlink() to wp_get_shortlink() to avoid a change in filters. props SergeyBiryukov, fixes #21309.
git-svn-id: http://core.svn.wordpress.org/trunk@22564 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-14 05:05:34 +00:00
Andrew Nacin 927c2c48d5 Sharper HiDPI alignment icons for TinyMCE. props lessbloat. fixes #22431.
git-svn-id: http://core.svn.wordpress.org/trunk@22562 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-14 03:41:47 +00:00
Mark Jaquith ca7b159cc7 Squash a PHP notice in the XML-RPC server.
git-svn-id: http://core.svn.wordpress.org/trunk@22560 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-13 22:35:41 +00:00
Andrew Nacin f1f045cdde 3.5-beta3
git-svn-id: http://core.svn.wordpress.org/trunk@22559 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-13 04:06:51 +00:00
Daryl Koopersmith 8e775dff4b Media: Better image detection in the embed from URL tab. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22558 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-13 03:33:41 +00:00
Daryl Koopersmith 0188fc3e52 Media: Add support for applicable *-upload-ui hooks.
Supports pre-upload-ui, pre-plupload-upload-ui, post-plupload-upload-ui, post-upload-ui.

see #22186, #21390.


git-svn-id: http://core.svn.wordpress.org/trunk@22557 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-13 01:50:08 +00:00
Daryl Koopersmith 65e35e3d76 Media: Improve backwards compatibility for image_size_names_choose filter. see #22186, #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22556 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-13 01:23:18 +00:00
Andrew Nacin 6f44d7c5bd SimplePie: Ensure the DOMNode::getLineNo() method exists. props rmccue. fixes #22425.
git-svn-id: http://core.svn.wordpress.org/trunk@22555 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-13 00:49:15 +00:00
Daryl Koopersmith b5ab7bbbc9 Media: Properly insert caption shortcodes for attachments.
git-svn-id: http://core.svn.wordpress.org/trunk@22554 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-13 00:32:04 +00:00
Daryl Koopersmith 8c73f531b9 Media: Add an "upload more files" button to upload states. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22552 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-12 23:52:17 +00:00
Bot (Assets) 8c60f41b2f Compress scripts/styles: 3.5-beta2-22551. TinyMCE updated.
git-svn-id: http://core.svn.wordpress.org/trunk@22551 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-12 22:58:31 +00:00
Andrew Ozz 114c42a3b5 TinuMCE: update to 3.5.7, fixes #21173
git-svn-id: http://core.svn.wordpress.org/trunk@22550 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-12 21:20:46 +00:00
Andrew Nacin 78f0c0a9df Revert [22421]. see #6821. see #22308. see #22419.
git-svn-id: http://core.svn.wordpress.org/trunk@22549 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-12 07:47:41 +00:00
Daryl Koopersmith 1ec12cccb9 Media: Allow successive embed URLs. see [22547], #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22548 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-12 06:02:03 +00:00
Daryl Koopersmith 2d87f983ad Media: Add Embed from URL tab.
Note: There is a bug that currently blocks adding several successive embeds.

see #21390.


git-svn-id: http://core.svn.wordpress.org/trunk@22547 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-12 05:57:12 +00:00
Bot (Assets) e84d1f724d Compress scripts/styles: 3.5-beta2-22546.
git-svn-id: http://core.svn.wordpress.org/trunk@22546 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-11 22:58:32 +00:00
Andrew Nacin 49a0dc9a27 In switch_theme(), make sure there are no residual template_root or stylesheet_root options remaining if there is only one theme root registered. see #22252.
git-svn-id: http://core.svn.wordpress.org/trunk@22545 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-11 21:51:27 +00:00
Andrew Nacin a756c8bfcd Ensure $_wp_default_headers is set before iterating over it in get_custom_header(). props jeffsebring. fixes #22221.
git-svn-id: http://core.svn.wordpress.org/trunk@22544 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-11 19:11:27 +00:00
Daryl Koopersmith 498e4c1366 Media: Ensure variables in the attachment details template have defined defaults.
* Adds styling to the upload progress bar in the attachment details template.
* Defines the `filename` attribute when Plupload creates the client-side `Attachment` model.

fixes #22410, see #21390.


git-svn-id: http://core.svn.wordpress.org/trunk@22543 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-11 05:16:41 +00:00
Daryl Koopersmith 82213846c3 Media: Add backwards compatibility for attachment_fields_to_edit and attachment_fields_to_save. see #22186.
git-svn-id: http://core.svn.wordpress.org/trunk@22541 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-11 01:26:42 +00:00
Bot (Assets) bbb099b2dd Compress scripts/styles: 3.5-beta2-22540.
git-svn-id: http://core.svn.wordpress.org/trunk@22540 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-10 22:58:34 +00:00
Daryl Koopersmith 0422f833a8 Media templates: Alter escaping regular expression to prevent it from aggresively consuming input meant for interpolation. see #22344, #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22539 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-10 21:38:14 +00:00
Ryan Boren 31e669df5a Pass an attachment ID, not a file path, to _load_image_to_edit_path() from wp_crop_image(). This fixes handling of attachments that require url fopen to access the image.
Allow passing urls instead of just file paths to WP_Image_Editor_Imagick::load() and WP_Image_Editor_GD::load() so that attachments requiring URL fopen can be handled.

see #6821


git-svn-id: http://core.svn.wordpress.org/trunk@22538 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-10 20:42:27 +00:00
Daryl Koopersmith 790464193d Media: Add custom URL as an option to attachment display properties. see #21390, #22206.
git-svn-id: http://core.svn.wordpress.org/trunk@22537 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-10 20:36:46 +00:00
Daryl Koopersmith 43c289dee6 Media: Automatically strip any non-image items from the collection when creating a gallery.
Also changes the rules for when the "new gallery" button shows:
* More than two items must be selected.
* At least one of them must be an image.

see #21390.


git-svn-id: http://core.svn.wordpress.org/trunk@22535 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-10 19:25:39 +00:00
Daryl Koopersmith 04b85c399d Media: Allow the modal sidebar to scroll. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22534 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-10 19:10:04 +00:00
Daryl Koopersmith 2396b66c98 Media: Watch additional search events. Properly captures clearing the search box. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22533 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-10 18:56:11 +00:00
Daryl Koopersmith 30e0a600bf Media: Add title, caption, and alt text, and attachment info to sidebar.
* Improve sidebar styles.
* Separate the hybrid title/caption field.
* Improve the sidebar image thumbnail.
* Remove filenames from inside the non-image icon thumbnail.
* Properly sync title/caption/alt.

see #21390.


git-svn-id: http://core.svn.wordpress.org/trunk@22532 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-10 18:25:04 +00:00
Andrew Nacin e7767b1eba Add comments to time intervals we cannot express with the constants. Fix a comment. props SergeyBiryukov. fixes #20987.
git-svn-id: http://core.svn.wordpress.org/trunk@22531 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-10 18:13:09 +00:00
Daryl Koopersmith 944066ef83 Media: Account for a race condition when deleting an edit gallery frame. see #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22530 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-10 09:57:28 +00:00
Daryl Koopersmith 9c20d148b9 Media: Add instructions to drag and drop to reorder images on gallery and batch edit pages.
Removes search boxes from these pages as well.

see #21390.


git-svn-id: http://core.svn.wordpress.org/trunk@22529 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-10 09:11:33 +00:00
Andrew Nacin 14b13a0935 Don't unnecessarily translate media upload tab strings. see #22186.
git-svn-id: http://core.svn.wordpress.org/trunk@22524 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-10 07:56:17 +00:00
Daryl Koopersmith bed08350f4 Media: Backwards compatibility for media_upload_tabs.
* Adds `createIframeStates()` to the `MediaFrame` view. It creates states and bindings for the `media_upload_tabs` output, and is included on `MediaFrame.Post` by default.
* Hijacks `tb_remove()` when the media modal is open to ensure the modal closes correctly.
* Adds a `chromeless` parameter to thickbox media tab URLs to render the UI without the old row of tabs.

see #22186, #21390.


git-svn-id: http://core.svn.wordpress.org/trunk@22523 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-10 07:51:37 +00:00
Andrew Nacin 809bb5a8f7 Update the JS version of the shortcode regex to match [22382]. props SergeyBiryukov. fixes #17657.
git-svn-id: http://core.svn.wordpress.org/trunk@22522 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-10 07:23:55 +00:00
Andrew Nacin 1429581c94 Customizer uploader control: Pass arrays of extensions around instead. see #22149.
git-svn-id: http://core.svn.wordpress.org/trunk@22519 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-10 04:59:46 +00:00
Daryl Koopersmith ef1889a89b Media: Relocate localization to wp_enqueue_media(). see #22186, #21390.
git-svn-id: http://core.svn.wordpress.org/trunk@22516 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-10 00:37:13 +00:00
Bot (Assets) c57076aab7 Compress scripts/styles: 3.5-beta2-22515.
git-svn-id: http://core.svn.wordpress.org/trunk@22515 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-09 22:58:35 +00:00
Andrew Nacin 8f08f77601 WordPress dialog jQuery UI widget:
* Link to the upstream bug report.
 * No need to specify the default value for an option.
 * Use the new _super() UI method to open the dialog, avoiding a direct reference to the parent.
 * Fix typo in comment.
 * Use public isOpen() method rather than a private property.

props scott.gonzalez.
fixes #22399.



git-svn-id: http://core.svn.wordpress.org/trunk@22514 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-09 22:36:35 +00:00
Andrew Nacin 8b53ffec74 Define a custom event prefix in the wpdialog jQuery UI widget to work around a jQuery UI 1.9.1 regression. see #22399.
git-svn-id: http://core.svn.wordpress.org/trunk@22513 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-09 21:45:13 +00:00
Jon Cave e860d3eb24 Minor WP_Image_Editor documentation fixes. See #6821.
git-svn-id: http://core.svn.wordpress.org/trunk@22511 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2012-11-09 20:10:33 +00:00