Changeset 27316 for trunk/src/wp-admin/includes/media.php

Timestamp:

02/27/2014 08:00:55 PM (13 years ago)

Author:

azaozz

Message:

Upgrade Plupload to 2.1.1, props kovshenin, see #25663

File:

• trunk/src/wp-admin/includes/media.php (modified) (2 diffs)

trunk/src/wp-admin/includes/media.php

@@ -1761 +1761 @@
 
 $plupload_init = array(
-        'runtimes' => 'html5,silverlight,flash,html4',
-        'browse_button' => 'plupload-browse-button',
-        'container' => 'plupload-upload-ui',
-        'drop_element' => 'drag-drop-area',
-        'file_data_name' => 'async-upload',
-        'multiple_queues' => true,
-        'max_file_size' => $max_upload_size . 'b',
-        '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( array('title' => __( 'Allowed Files' ), 'extensions' => '*') ),
-        'multipart' => true,
-        'urlstream_upload' => true,
-        'multipart_params' => $post_params
+        'runtimes'            => 'html5,silverlight,flash,html4',
+        'browse_button'       => 'plupload-browse-button',
+        'container'           => 'plupload-upload-ui',
+        'drop_element'        => 'drag-drop-area',
+        'file_data_name'      => 'async-upload',
+        'url'                 => $upload_action_url,
+        'flash_swf_url'       => includes_url( 'js/plupload/Moxie.swf' ),
+        'silverlight_xap_url' => includes_url( 'js/plupload/Moxie.xap' ),
+        'filters' => array(
+                'max_file_size'   => $max_upload_size . 'b',
+        ),
+        'multipart_params'    => $post_params,
 );
 
@@ -1861 +1859 @@
 <span class="max-upload-size"><?php printf( __( 'Maximum upload file size: %d%s.' ), esc_html($upload_size_unit), esc_html($sizes[$u]) ); ?></span>
 <?php
-if ( ($is_IE || $is_opera) && $max_upload_size > 100 * 1024 * 1024 ) { ?>
-        <span class="big-file-warning"><?php _e('Your browser has some limitations uploading large files with the multi-file uploader. Please use the browser uploader for files over 100MB.'); ?></span>
-<?php }
 
         /**