Commit Graph

536 Commits

Author SHA1 Message Date
Gary Pendergast
007ec52958 Add wp_json_encode(), a wrapper for json_encode() that ensures everything is converted to UTF-8.
Change all core calls from `json_encode()` to `wp_json_encode()`.

Fixes #28786.


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


git-svn-id: http://core.svn.wordpress.org/trunk@30055 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-10-28 18:35:19 +00:00
Andrew Ozz
7a55ab9164 Media: disable multi-file uploading in iOS 7.x Safari as it prevents uploading of videos. Fixes #29602 for trunk.
Built from https://develop.svn.wordpress.org/trunk@29776


git-svn-id: http://core.svn.wordpress.org/trunk@29548 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-09-29 00:14:18 +00:00
Sergey Biryukov
26124b9aad Pass the attachment ID to the 'image_add_caption_text' filter.
fixes #29607.
Built from https://develop.svn.wordpress.org/trunk@29754


git-svn-id: http://core.svn.wordpress.org/trunk@29526 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-09-21 10:11:16 +00:00
Sergey Biryukov
79d017a024 Add 'image_add_caption_text' filter for changing the pre-parse caption text before output to the editor.
props collinsinternet, DrewAPicture.
fixes #29607.
Built from https://develop.svn.wordpress.org/trunk@29753


git-svn-id: http://core.svn.wordpress.org/trunk@29525 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-09-21 09:56:17 +00:00
Scott Taylor
69998d452b In media_handle_upload(), don't call wp_read_image_metadata() on things that aren't images (like videos). We never caught this error, because we are suppressing it by calling @wp_read_image_metadata().
Props jrf for the initial patch.
Fixes #28907.

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


git-svn-id: http://core.svn.wordpress.org/trunk@29511 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-09-11 20:15:17 +00:00
Andrew Ozz
69e7171f41 Media: revert enabling of multi-file uploading for mobile devices. Currently only iOS Safari supports it but has a bug that prevents uploading of videos. Fixes #29602
Built from https://develop.svn.wordpress.org/trunk@29729


git-svn-id: http://core.svn.wordpress.org/trunk@29503 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-09-10 22:40:16 +00:00
Scott Taylor
fa0acbe3bb Don't overwrite the length property unnecessarily when generating metadata for audio and video files.
Props jrf, wonderboymusic.
Fixes #29176.

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


git-svn-id: http://core.svn.wordpress.org/trunk@29502 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-09-10 21:57:15 +00:00
Sergey Biryukov
1eb26d3ff3 Use https for apps.wordpress.org links.
props pento.
fixes #29595 for trunk.
Built from https://develop.svn.wordpress.org/trunk@29721


git-svn-id: http://core.svn.wordpress.org/trunk@29495 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-09-09 06:29:15 +00:00
Andrew Nacin
00fac0639d Link to apps.wordpress.org instead of wordpress.org/mobile.
props pento.
fixes #29496.

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


git-svn-id: http://core.svn.wordpress.org/trunk@29477 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-09-04 14:22:15 +00:00
Sergey Biryukov
5faf09a261 Restore 'insert-media-button' as an ID attribute for the first instance of media_buttons(). Remove IDs for subsequent instances.
props nacin.
fixes #28090.
Built from https://develop.svn.wordpress.org/trunk@29671


git-svn-id: http://core.svn.wordpress.org/trunk@29445 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-09-02 09:08:16 +00:00
Dominik Schilling
8ea68677f3 Media Upload: Improve styling of error messages.
props afercia, michalzuber.
fixes #29047.
Built from https://develop.svn.wordpress.org/trunk@29355


git-svn-id: http://core.svn.wordpress.org/trunk@29131 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-08-02 14:14:19 +00:00
Sergey Biryukov
be718ee860 Declare the variable before using it.
props danielbachhuber.
fixes #28932.
Built from https://develop.svn.wordpress.org/trunk@29215


git-svn-id: http://core.svn.wordpress.org/trunk@28999 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-07-17 22:01:14 +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
Scott Taylor
57dbc55e6e When setting the poster image for a video shortcode, set that image as the featured image for that attachment (if found) in the background. This AJAX functionality could be used for audio as well.
Introduces `attachment_url_to_postid()` to attempt to turn URLs into post IDs.

Fixes #27891.

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


git-svn-id: http://core.svn.wordpress.org/trunk@28817 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-07-08 17:48:17 +00:00
Scott Taylor
650261b549 In deprecated media iframe code, attachment_fields_to_save filter should not be called twice after initial image upload in post.
Props SergeyBiryukov.
Fixes #20720.

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


git-svn-id: http://core.svn.wordpress.org/trunk@28671 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-06-27 21:32:16 +00:00
Andrew Ozz
b9fd9db83b Uploader: enable selecting multiple files on mobile devices (still doesn't work on Android). See #28640.
Built from https://develop.svn.wordpress.org/trunk@28847


git-svn-id: http://core.svn.wordpress.org/trunk@28651 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-06-26 04:15:15 +00:00
Scott Taylor
41ab39f42c In media_buttons(), add a static var $instance to increment the id attribute of insert-media-button-%d on each call.
Props ericlewis.
Fixes #28090.

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


git-svn-id: http://core.svn.wordpress.org/trunk@28641 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-06-26 01:05:14 +00:00
Drew Jaynes
1868c1fc4b Remove unnecessary "not used" notation for filter parameters in wp-admin/includes/media.php.
Also add `@param` and `@return` descriptions.

See #28408.

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


git-svn-id: http://core.svn.wordpress.org/trunk@28451 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-05-30 17:38:14 +00:00
Scott Taylor
8b7b72d75e In media_sideload_image(), check the returned value of download_url() earlier to avoid attempting to unlink() an instance of WP_Error.
Props georgestephanis. 
Fixes #28204.

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


git-svn-id: http://core.svn.wordpress.org/trunk@28392 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-05-23 21:33:14 +00:00
Scott Taylor
130771a383 hackificator doesn't like mixed quote styles in some generated HTML. The switch from single to double allows these files to be parsed.
See #27881.

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


git-svn-id: http://core.svn.wordpress.org/trunk@28323 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-05-19 01:59:15 +00:00
Scott Taylor
54321f4c6e Eliminate use of extract() in get_media_item().
To test, fire open the old media in the console: `tb_show('Old Media is Weird', 'media-upload.php?type=image&TB_iframe=true&post_id=0');`	
	
See #22400.

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


git-svn-id: http://core.svn.wordpress.org/trunk@28234 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-05-15 02:45:15 +00:00
Scott Taylor
2bea9fcc0b In media_upload_gallery_form()'s inline JavaScript, remove unnecessary comment tags.
Fixes #25637.


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


git-svn-id: http://core.svn.wordpress.org/trunk@28196 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-05-11 06:12:15 +00:00
Scott Taylor
1daa7d6723 Leverage size_format() when displaying max_upload_size:
* In `media_upload_form()` 
* The `uploader-inline` Underscore template in the media modal. 

Replaces 2 buggy inline implementations that could display size units off by one, or size values off by one.

Fixes #25643.


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


git-svn-id: http://core.svn.wordpress.org/trunk@28171 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-05-07 18:25:14 +00:00
Scott Taylor
71ac0f21c2 In get_media_item(), $tags and $_tags are set and never used.
See #27882.

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


git-svn-id: http://core.svn.wordpress.org/trunk@28125 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-05-06 16:41:17 +00:00
Scott Taylor
dd73ad4299 In edit_form_image_editor(), $filename and $title are set and then unused. They shall be removed.
See #27882.


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


git-svn-id: http://core.svn.wordpress.org/trunk@28099 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-05-06 04:45:16 +00:00
Andrew Ozz
c9f5ed0801 Plupload: restore the settings in media_upload_form(), see #27763
Built from https://develop.svn.wordpress.org/trunk@28110


git-svn-id: http://core.svn.wordpress.org/trunk@27941 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-04-14 00:41:15 +00:00
Drew Jaynes
4af2840a47 Clarify PHPDoc return description for media_handle_upload().
Props jdgrimes.
Fixes #27519.

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


git-svn-id: http://core.svn.wordpress.org/trunk@27711 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-31 22:33:15 +00:00
Scott Taylor
01d2062af3 Cleanup up the display, escaping, and handling of ID3 data for media. Rename wp_get_relevant_id3_keys() to wp_get_attachment_id3_keys().
Props nacin.
See #27574.


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


git-svn-id: http://core.svn.wordpress.org/trunk@27700 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-31 05:16:16 +00:00
Andrew Nacin
c95f232727 Cleanups for audio/video metadata, see [27862].
see #27574.

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


git-svn-id: http://core.svn.wordpress.org/trunk@27695 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-30 21:08:14 +00:00
Scott Taylor
d947a55495 Metadata for audio and video files:
* Make attachment metadata for audio files editable by providing a metabox on the Edit Media page
* Standardize on using the attachment title everywhere
* Label the Caption and Description fields for audio and video appropriately
* Make the playlist Underscore templates more straightforward

See #27574.


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


git-svn-id: http://core.svn.wordpress.org/trunk@27693 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-30 19:28:16 +00:00
Drew Jaynes
7dc9b02577 Correct misleading verbiage in 'print' hook docs.
Standardizes 'print' hook docs on the concept that hooks are fired when scripts and styles are printed.

Props ericlewis for the initial patch.
Fixes #26924.

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


git-svn-id: http://core.svn.wordpress.org/trunk@27534 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-25 08:05:15 +00:00
Andrew Nacin
9babc32900 Use correct variable. see [27373].
props TobiasBg.
fixes #14424.

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


git-svn-id: http://core.svn.wordpress.org/trunk@27518 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-24 03:25:16 +00:00
Andrew Ozz
69b74a75cd Plupload: switch to urlstream upload method when the 'flash' runtime is used in non IE browsers. This ensures cookies are sent but limits the maximum file size that flash can handle.
By default only IE9 and older use flash so this change is mostly for completeness. It would affect only the (extremely rare) cases where a plugin disables the html5 runtime.
Built from https://develop.svn.wordpress.org/trunk@27662


git-svn-id: http://core.svn.wordpress.org/trunk@27505 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-23 23:45:19 +00:00
Dominik Schilling
d1f3abe55c Remove "Show" prefix from filter dropdowns, see #26743.
Built from https://develop.svn.wordpress.org/trunk@27626


git-svn-id: http://core.svn.wordpress.org/trunk@27469 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-19 22:13:14 +00:00
Andrew Nacin
fe260c6a15 Assign correct variable.
props nendeb55.
fixes #27351. see #14424, [27373].

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


git-svn-id: http://core.svn.wordpress.org/trunk@27344 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-11 13:24:14 +00:00
Andrew Nacin
449ffedfb9 maybe_regenerate_attachment_metadata() is now wp_maybe_generate_attachment_metadata().
props kovshenin.
fixes #26825.

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


git-svn-id: http://core.svn.wordpress.org/trunk@27288 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-06 19:34:14 +00:00
Mark Jaquith
fb56a9942b Eliminate some of our last remaining create_function() instances
* Moved some into private function callbacks
* Eliminated some that weren't necessary anymore

props obenland, markjaquith, nacin. fixes #14424
Built from https://develop.svn.wordpress.org/trunk@27373


git-svn-id: http://core.svn.wordpress.org/trunk@27222 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-03 16:21:16 +00:00
Andrew Nacin
0c16c0477b Reference https://wordpress.org rather than http://wordpress.org in strings, links, comments, etc.
props Ipstenu, markjaquith.
see #27115.

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


git-svn-id: http://core.svn.wordpress.org/trunk@27219 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-03-03 02:34:27 +00:00
Scott Taylor
e92770ba93 * Videos should always render at the same aspect ratio.
* Don't force a pseudo-mime-type for `.m4v` files
* Uniformly adapt to `$content_width` when setting video dimensions on the front end
* Add the `height` attribute to the initial `<video>` in the video playlist JS template
* Add some defensive/responsive CSS for a/v on the Edit Media page

See #27243.


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


git-svn-id: http://core.svn.wordpress.org/trunk@27180 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-02-28 21:28:14 +00:00
Andrew Ozz
d896fa2487 Upgrade Plupload to 2.1.1, props kovshenin, see #25663
Built from https://develop.svn.wordpress.org/trunk@27316


git-svn-id: http://core.svn.wordpress.org/trunk@27168 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-02-27 20:01:16 +00:00
Scott Taylor
03dda3b273 Introduce maybe_regenerate_attachment_metadata( $attachment ). On the Edit Media screen, call it for Audio and Video files.
The functions checks if the item is lacking metadata altogether. If a video or audio file was uploaded prior to 3.6, it does not have any metadata. This tries to fix it. Implements locking via a transient to protect against this running in parallel with another request.

This is the minimum viable product for #26825, but leaving the ticket open unless this function needs to be called in other places.

See #26825.


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


git-svn-id: http://core.svn.wordpress.org/trunk@26994 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-02-07 22:41:12 +00:00
Andrew Ozz
87589dd445 Remove table cellspacing attribute from the admin, part-props MattyRob, fixes #22086.
Built from https://develop.svn.wordpress.org/trunk@27036


git-svn-id: http://core.svn.wordpress.org/trunk@26912 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-01-26 20:28:12 +00:00
Andrew Ozz
eb1d21d782 Remove all "valign" attributes from tables in wp-admin, props MikeHansenMe, Marventus. Fixes #22712.
Built from https://develop.svn.wordpress.org/trunk@27029


git-svn-id: http://core.svn.wordpress.org/trunk@26905 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-01-24 19:06:15 +00:00
Drew Jaynes
f51b1f8def Inline documentation for hooks in wp-admin/includes/media.php.
Props kpdesign, DrewAPicture.
Fixes #25375.

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


git-svn-id: http://core.svn.wordpress.org/trunk@26791 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2014-01-06 05:48:12 +00:00
Scott Taylor
7a7b9c89ec Use parens to ensure that RegEx OR matches the front when determining that mime-type matches audio|video in attachment_submitbox_metadata().
Props kovshenin.
See #23926.


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


git-svn-id: http://core.svn.wordpress.org/trunk@25640 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-10-08 15:32:10 +00:00
Helen Hou-Sandí
9d5c2eb55f Make sure the attachment file exists before calling filesize() on it. props DrewAPicture. fixes #25170.
Built from https://develop.svn.wordpress.org/trunk@25608


git-svn-id: http://core.svn.wordpress.org/trunk@25525 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-09-24 20:23:10 +00:00
Helen Hou-Sandí
0758df9758 Add file size to attachment publish meta box. props desrosj. fixes #25170.
Built from https://develop.svn.wordpress.org/trunk@25403


git-svn-id: http://core.svn.wordpress.org/trunk@25333 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-09-12 15:10:09 +00:00
Helen Hou-Sandí
8798685de5 Alignment standards for [25296]. props DrewAPicture. see #25171.
Built from https://develop.svn.wordpress.org/trunk@25300


git-svn-id: http://core.svn.wordpress.org/trunk@25263 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-09-07 22:07:09 +00:00
Helen Hou-Sandí
304426cece Add dynamic classes for attachment metadata submitbox sections. see #22333, #25171.
Built from https://develop.svn.wordpress.org/trunk@25297


git-svn-id: http://core.svn.wordpress.org/trunk@25260 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-09-07 16:20:09 +00:00
Helen Hou-Sandí
89421ddeaa Add media_submitbox_misc_sections and audio_submitbox_misc_sections filters to allow removing or adding of attachment submitbox sections containing attachment metadata. props desroj, DrewAPicture. fixes #25171.
Built from https://develop.svn.wordpress.org/trunk@25296


git-svn-id: http://core.svn.wordpress.org/trunk@25259 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2013-09-07 16:19:10 +00:00