<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[27662] trunk/src: Plupload: switch to urlstream upload method when the 'flash' runtime is used in non IE browsers.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/27662">27662</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2014-03-23 23:44:20 +0000 (Sun, 23 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesmediaphp">trunk/src/wp-admin/includes/media.php</a></li>
<li><a href="#trunksrcwpincludesjspluploadhandlersjs">trunk/src/wp-includes/js/plupload/handlers.js</a></li>
<li><a href="#trunksrcwpincludesjspluploadwppluploadjs">trunk/src/wp-includes/js/plupload/wp-plupload.js</a></li>
<li><a href="#trunksrcwpincludesmediaphp">trunk/src/wp-includes/media.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesmediaphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/media.php (27661 => 27662)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/media.php 2014-03-23 12:41:58 UTC (rev 27661)
+++ trunk/src/wp-admin/includes/media.php 2014-03-23 23:44:20 UTC (rev 27662)
</span><span class="lines">@@ -1760,7 +1760,7 @@
</span><span class="cx"> $post_params = apply_filters( 'upload_post_params', $post_params );
</span><span class="cx">
</span><span class="cx"> $plupload_init = array(
</span><del>- 'runtimes' => 'html5,silverlight,flash,html4',
</del><ins>+ 'runtimes' => 'html5,flash,silverlight,html4',
</ins><span class="cx"> 'browse_button' => 'plupload-browse-button',
</span><span class="cx"> 'container' => 'plupload-upload-ui',
</span><span class="cx"> 'drop_element' => 'drag-drop-area',
</span></span></pre></div>
<a id="trunksrcwpincludesjspluploadhandlersjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/plupload/handlers.js (27661 => 27662)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/plupload/handlers.js 2014-03-23 12:41:58 UTC (rev 27661)
+++ trunk/src/wp-includes/js/plupload/handlers.js 2014-03-23 23:44:20 UTC (rev 27662)
</span><span class="lines">@@ -400,6 +400,16 @@
</span><span class="cx">
</span><span class="cx"> // init and set the uploader
</span><span class="cx"> uploader_init = function() {
</span><ins>+ 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;
+ }
+
</ins><span class="cx"> uploader = new plupload.Uploader(wpUploaderInit);
</span><span class="cx">
</span><span class="cx"> $('#image_resize').bind('change', function() {
</span><span class="lines">@@ -430,8 +440,9 @@
</span><span class="cx"> $('#drag-drop-area').unbind('.wp-uploader');
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( up.runtime == 'html4' )
</del><ins>+ if ( up.runtime === 'html4' ) {
</ins><span class="cx"> $('.upload-flash-bypass').hide();
</span><ins>+ }
</ins><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> uploader.init();
</span></span></pre></div>
<a id="trunksrcwpincludesjspluploadwppluploadjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/js/plupload/wp-plupload.js (27661 => 27662)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/js/plupload/wp-plupload.js 2014-03-23 12:41:58 UTC (rev 27661)
+++ trunk/src/wp-includes/js/plupload/wp-plupload.js 2014-03-23 23:44:20 UTC (rev 27662)
</span><span class="lines">@@ -25,6 +25,7 @@
</span><span class="cx"> */
</span><span class="cx"> Uploader = function( options ) {
</span><span class="cx"> var self = this,
</span><ins>+ isIE = navigator.userAgent.indexOf('Trident/') != -1 || navigator.userAgent.indexOf('MSIE ') != -1,
</ins><span class="cx"> elements = {
</span><span class="cx"> container: 'container',
</span><span class="cx"> browser: 'browse_button',
</span><span class="lines">@@ -85,6 +86,14 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ // 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;
+ }
+
</ins><span class="cx"> this.uploader = new plupload.Uploader( this.plupload );
</span><span class="cx"> delete this.plupload;
</span><span class="cx">
</span></span></pre></div>
<a id="trunksrcwpincludesmediaphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/media.php (27661 => 27662)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/media.php 2014-03-23 12:41:58 UTC (rev 27661)
+++ trunk/src/wp-includes/media.php 2014-03-23 23:44:20 UTC (rev 27662)
</span><span class="lines">@@ -2176,7 +2176,7 @@
</span><span class="cx"> $max_upload_size = wp_max_upload_size();
</span><span class="cx">
</span><span class="cx"> $defaults = array(
</span><del>- 'runtimes' => 'html5,silverlight,flash,html4',
</del><ins>+ 'runtimes' => 'html5,flash,silverlight,html4',
</ins><span class="cx"> 'file_data_name' => 'async-upload', // key passed to $_FILE.
</span><span class="cx"> 'url' => admin_url( 'async-upload.php', 'relative' ),
</span><span class="cx"> 'flash_swf_url' => includes_url( 'js/plupload/Moxie.swf' ),
</span></span></pre>
</div>
</div>
</body>
</html>