WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

In `wp_media_upload_handler()`, replace a lingering instance of `media_upload_gallery()` with `wp_iframe(...)` 

Props jeffstieler, antpb.
Fixes #17812. 

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


git-svn-id: http://core.svn.wordpress.org/trunk@33972 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Scott Taylor 2015-09-10 17:24:23 +00:00
parent 811f76699b
commit 52498a8546
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -805,7 +805,9 @@ function wp_media_upload_handler() {
if ( isset( $_POST['save'] ) ) {
$errors['upload_notice'] = __('Saved.');
return media_upload_gallery();
wp_enqueue_script( 'admin-gallery' );
return wp_iframe( 'media_upload_gallery_form', $errors );
} elseif ( ! empty( $_POST ) ) {
$return = media_upload_form_handler();

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.4-alpha-34002';
$wp_version = '4.4-alpha-34003';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.