diff --git a/src/wp-includes/js/plupload/handlers.js b/src/wp-includes/js/plupload/handlers.js index 2c6b1272d4..b7d77dc7bf 100644 --- a/src/wp-includes/js/plupload/handlers.js +++ b/src/wp-includes/js/plupload/handlers.js @@ -401,7 +401,7 @@ jQuery(document).ready(function($){ // init and set the uploader uploader_init = function() { uploader = new plupload.Uploader(wpUploaderInit); -//console.dir(uploader) + $('#image_resize').bind('change', function() { var arg = $(this).prop('checked'); @@ -415,7 +415,7 @@ jQuery(document).ready(function($){ uploader.bind('Init', function(up) { var uploaddiv = $('#plupload-upload-ui'); -window.console.dir('init...');window.console.dir(up); + setResize( getUserSetting('upload_resize', false) ); if ( up.features.dragdrop && ! $(document.body).hasClass('mobile') ) { diff --git a/src/wp-includes/media.php b/src/wp-includes/media.php index e3ff433bb7..854b2b8a94 100644 --- a/src/wp-includes/media.php +++ b/src/wp-includes/media.php @@ -2053,7 +2053,7 @@ function wp_plupload_default_settings() { $max_upload_size = wp_max_upload_size(); $defaults = array( - 'runtimes' => 'flash,html4', // html5,silverlight, + 'runtimes' => 'html5,silverlight,flash,html4', 'file_data_name' => 'async-upload', // key passed to $_FILE. 'url' => admin_url( 'async-upload.php', 'relative' ), 'flash_swf_url' => includes_url( 'js/plupload/Moxie.swf' ),