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

Fix silverlight uploading when not resizing files on the fly, props kurtpayne, see #18206 

git-svn-id: http://svn.automattic.com/wordpress/trunk@18620 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
azaozz 2011-08-29 23:59:22 +00:00
parent b9d9d11f4e
commit 81871e05b4
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-includes/js/plupload/handlers.dev.js
View File

@ -86,7 +86,7 @@ function setResize(r) {
uploader.settings.multipart_params.image_resize = true; uploader.settings.multipart_params.image_resize = true;
} else { } else {
uploader.settings.resize = {}; uploader.settings.resize = {};
uploader.settings.multipart_params.image_resize = null; uploader.settings.multipart_params.image_resize = false;
} }
} }

2
wp-includes/js/plupload/handlers.js
View File

File diff suppressed because one or more lines are too long

2
wp-includes/script-loader.php
View File

@ -193,7 +193,7 @@ function wp_default_scripts( &$scripts ) {
// TODO: find out if we can use the plupload.full.js, it loads browserplus init JS from Yahoo // TODO: find out if we can use the plupload.full.js, it loads browserplus init JS from Yahoo
$scripts->add( 'plupload-full', false, array('plupload', 'plupload-html5', 'plupload-flash', 'plupload-silverlight', 'plupload-html4'), '1.4.3.2'); $scripts->add( 'plupload-full', false, array('plupload', 'plupload-html5', 'plupload-flash', 'plupload-silverlight', 'plupload-html4'), '1.4.3.2');
$scripts->add( 'plupload-handlers', "/wp-includes/js/plupload/handlers$suffix.js", array('plupload-full', 'jquery'), '1.4.3.2'); $scripts->add( 'plupload-handlers', "/wp-includes/js/plupload/handlers$suffix.js", array('plupload-full', 'jquery'), '20110829');
$scripts->add_script_data( 'plupload-handlers', 'pluploadL10n', $uploader_l10n ); $scripts->add_script_data( 'plupload-handlers', 'pluploadL10n', $uploader_l10n );
// keep 'swfupload' for back-compat. // keep 'swfupload' for back-compat.