Changeset 27662

Timestamp:

03/23/2014 11:44:20 PM (12 years ago)

Author:

azaozz

Message:

Plupload: switch to urlstream upload method when the 'flash' runtime is used in non IE browsers. This ensures cookies are sent but limits the maximum file size that flash can handle.

By default only IE9 and older use flash so this change is mostly for completeness. It would affect only the (extremely rare) cases where a plugin disables the html5 runtime.

Location:

trunk/src

Files:

• wp-admin/includes/media.php (modified) (1 diff)
• wp-includes/js/plupload/handlers.js (modified) (2 diffs)
• wp-includes/js/plupload/wp-plupload.js (modified) (2 diffs)
• wp-includes/media.php (modified) (1 diff)

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

@@ -1761 +1761 @@
 
 $plupload_init = array(
-        'runtimes'            => 'html5,silverlight,flash,html4',
+        'runtimes'            => 'html5,flash,silverlight,html4',
         'browse_button'       => 'plupload-browse-button',
         'container'           => 'plupload-upload-ui',

trunk/src/wp-includes/js/plupload/handlers.js

@@ -401 +401 @@
         // init and set the uploader
         uploader_init = function() {
+                var isIE = navigator.userAgent.indexOf('Trident/') != -1 || navigator.userAgent.indexOf('MSIE ') != -1;
+
+                 // Make sure flash sends cookies (seems in IE it does whitout switching to urlstream mode)
+                 if ( ! isIE && 'flash' === plupload.predictRuntime( wpUploaderInit ) &&
+                        ( ! wpUploaderInit.required_features || ! wpUploaderInit.required_features.hasOwnProperty( 'send_binary_string' ) ) ) {
+
+                        wpUploaderInit.required_features = wpUploaderInit.required_features || {};
+                        wpUploaderInit.required_features.send_binary_string = true;
+                }
+
                 uploader = new plupload.Uploader(wpUploaderInit);
 
@@ -431 +441 @@
                         }
 
-                        if ( up.runtime == 'html4' )
+                        if ( up.runtime === 'html4' ) {
                                 $('.upload-flash-bypass').hide();
+                        }
                 });
 

trunk/src/wp-includes/js/plupload/wp-plupload.js

@@ -26 +26 @@
         Uploader = function( options ) {
                 var self = this,
+                        isIE = navigator.userAgent.indexOf('Trident/') != -1 || navigator.userAgent.indexOf('MSIE ') != -1,
                         elements = {
                                 container: 'container',
@@ -84 +85 @@
                 if ( ! ( this.browser && this.browser.length ) && ! ( this.dropzone && this.dropzone.length ) ) {
                         return;
+                }
+
+                 // Make sure flash sends cookies (seems in IE it does whitout switching to urlstream mode)
+                 if ( ! isIE && 'flash' === plupload.predictRuntime( this.plupload ) &&
+                        ( ! this.plupload.required_features || ! this.plupload.required_features.hasOwnProperty( 'send_binary_string' ) ) ) {
+
+                        this.plupload.required_features = this.plupload.required_features || {};
+                        this.plupload.required_features.send_binary_string = true;
                 }
 

trunk/src/wp-includes/media.php

@@ -2177 +2177 @@
 
         $defaults = array(
-                'runtimes'            => 'html5,silverlight,flash,html4',
+                'runtimes'            => 'html5,flash,silverlight,html4',
                 'file_data_name'      => 'async-upload', // key passed to $_FILE.
                 'url'                 => admin_url( 'async-upload.php', 'relative' ),