IntenseWebs/WordPress
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

In deprecated media iframe code, attachment_fields_to_save filter should not be called twice after initial image upload in post.

Browse Source 
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
This commit is contained in:
Scott Taylor 2014-06-27 21:32:16 +00:00
parent 71090a7f12
commit 650261b549
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
wp-admin/includes/media.php
View File

@ -773,7 +773,10 @@ function wp_media_upload_handler() {
return media_send_to_editor($html); return media_send_to_editor($html);
} }
if ( !empty($_POST) ) { if ( isset( $_POST['save'] ) ) {
$errors['upload_notice'] = __('Saved.');
return media_upload_gallery();
} elseif ( ! empty( $_POST ) ) {
$return = media_upload_form_handler(); $return = media_upload_form_handler();
if ( is_string($return) ) if ( is_string($return) )
@ -782,11 +785,6 @@ function wp_media_upload_handler() {
$errors = $return; $errors = $return;
} }
if ( isset($_POST['save']) ) {
$errors['upload_notice'] = __('Saved.');
return media_upload_gallery();
}
if ( isset($_GET['tab']) && $_GET['tab'] == 'type_url' ) { if ( isset($_GET['tab']) && $_GET['tab'] == 'type_url' ) {
$type = 'image'; $type = 'image';
if ( isset( $_GET['type'] ) && in_array( $_GET['type'], array( 'video', 'audio', 'file' ) ) ) if ( isset( $_GET['type'] ) && in_array( $_GET['type'], array( 'video', 'audio', 'file' ) ) )