mirror of
https://github.com/WordPress/WordPress.git
synced 2025-02-16 19:46:21 +00:00
Plupload:
- Update to 2.1.9. - Include the non-minified plupload.js and moxie.js. - Remove support for Flash and Silverlight, the available runtime options are `html5` and `html4`. - Delete plupload.flash.swf and plupload.silverlight.xap. Fixes #41755. Built from https://develop.svn.wordpress.org/trunk@41328 git-svn-id: http://core.svn.wordpress.org/trunk@41159 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
564e13cf30
commit
e38ec0f485
@ -1868,15 +1868,16 @@ $post_params = array(
|
|||||||
*/
|
*/
|
||||||
$post_params = apply_filters( 'upload_post_params', $post_params );
|
$post_params = apply_filters( 'upload_post_params', $post_params );
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Since 4.9 the `runtimes` setting is hardcoded in our version of Plupload to `html5,html4`,
|
||||||
|
* and the `flash_swf_url` and `silverlight_xap_url` are not used.
|
||||||
|
*/
|
||||||
$plupload_init = array(
|
$plupload_init = array(
|
||||||
'runtimes' => 'html5,flash,silverlight,html4',
|
|
||||||
'browse_button' => 'plupload-browse-button',
|
'browse_button' => 'plupload-browse-button',
|
||||||
'container' => 'plupload-upload-ui',
|
'container' => 'plupload-upload-ui',
|
||||||
'drop_element' => 'drag-drop-area',
|
'drop_element' => 'drag-drop-area',
|
||||||
'file_data_name' => 'async-upload',
|
'file_data_name' => 'async-upload',
|
||||||
'url' => $upload_action_url,
|
'url' => $upload_action_url,
|
||||||
'flash_swf_url' => includes_url( 'js/plupload/plupload.flash.swf' ),
|
|
||||||
'silverlight_xap_url' => includes_url( 'js/plupload/plupload.silverlight.xap' ),
|
|
||||||
'filters' => array(
|
'filters' => array(
|
||||||
'max_file_size' => $max_upload_size . 'b',
|
'max_file_size' => $max_upload_size . 'b',
|
||||||
),
|
),
|
||||||
|
@ -712,6 +712,9 @@ $_old_files = array(
|
|||||||
'wp-includes/js/tinymce/skins/lightgray/fonts/tinymce-small.json',
|
'wp-includes/js/tinymce/skins/lightgray/fonts/tinymce-small.json',
|
||||||
'wp-includes/js/tinymce/skins/lightgray/fonts/tinymce.json',
|
'wp-includes/js/tinymce/skins/lightgray/fonts/tinymce.json',
|
||||||
'wp-includes/js/tinymce/skins/lightgray/skin.ie7.min.css',
|
'wp-includes/js/tinymce/skins/lightgray/skin.ie7.min.css',
|
||||||
|
// 4.9
|
||||||
|
'wp-includes/js/plupload/plupload.flash.swf',
|
||||||
|
'wp-includes/js/plupload/plupload.silverlight.xap',
|
||||||
);
|
);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
9901
wp-includes/js/plupload/moxie.js
Normal file
9901
wp-includes/js/plupload/moxie.js
Normal file
File diff suppressed because it is too large
Load Diff
Binary file not shown.
29
wp-includes/js/plupload/plupload.full.min.js
vendored
29
wp-includes/js/plupload/plupload.full.min.js
vendored
File diff suppressed because one or more lines are too long
2379
wp-includes/js/plupload/plupload.js
Normal file
2379
wp-includes/js/plupload/plupload.js
Normal file
File diff suppressed because it is too large
Load Diff
Binary file not shown.
@ -3002,12 +3002,13 @@ function wp_plupload_default_settings() {
|
|||||||
$extensions = array_merge( $extensions, explode( '|', $extension ) );
|
$extensions = array_merge( $extensions, explode( '|', $extension ) );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Since 4.9 the `runtimes` setting is hardcoded in our version of Plupload to `html5,html4`,
|
||||||
|
* and the `flash_swf_url` and `silverlight_xap_url` are not used.
|
||||||
|
*/
|
||||||
$defaults = array(
|
$defaults = array(
|
||||||
'runtimes' => 'html5,flash,silverlight,html4',
|
|
||||||
'file_data_name' => 'async-upload', // key passed to $_FILE.
|
'file_data_name' => 'async-upload', // key passed to $_FILE.
|
||||||
'url' => admin_url( 'async-upload.php', 'relative' ),
|
'url' => admin_url( 'async-upload.php', 'relative' ),
|
||||||
'flash_swf_url' => includes_url( 'js/plupload/plupload.flash.swf' ),
|
|
||||||
'silverlight_xap_url' => includes_url( 'js/plupload/plupload.silverlight.xap' ),
|
|
||||||
'filters' => array(
|
'filters' => array(
|
||||||
'max_file_size' => $max_upload_size . 'b',
|
'max_file_size' => $max_upload_size . 'b',
|
||||||
'mime_types' => array( array( 'extensions' => implode( ',', $extensions ) ) ),
|
'mime_types' => array( array( 'extensions' => implode( ',', $extensions ) ) ),
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
*
|
*
|
||||||
* @global string $wp_version
|
* @global string $wp_version
|
||||||
*/
|
*/
|
||||||
$wp_version = '4.9-alpha-41327';
|
$wp_version = '4.9-alpha-41328';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
|
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
|
||||||
|
Loading…
x
Reference in New Issue
Block a user