<!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>[18073] trunk/wp-includes: Add some delay to allow the flash uploader swf to load in FF4, fixes #17329</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, #logmsg > ol { margin-left: 0; 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://trac.wordpress.org/changeset/18073">18073</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2011-05-30 02:23:45 +0000 (Mon, 30 May 2011)</dd>
</dl>

<h3>Log Message</h3>
<pre>Add some delay to allow the flash uploader swf to load in FF4, fixes <a href="http://trac.wordpress.org/ticket/17329">#17329</a></pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesjsswfuploadpluginsswfuploadswfobjectjs">trunk/wp-includes/js/swfupload/plugins/swfupload.swfobject.js</a></li>
<li><a href="#trunkwpincludesjsswfuploadswfuploadalljs">trunk/wp-includes/js/swfupload/swfupload-all.js</a></li>
<li><a href="#trunkwpincludesscriptloaderphp">trunk/wp-includes/script-loader.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesjsswfuploadpluginsswfuploadswfobjectjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/swfupload/plugins/swfupload.swfobject.js (18072 => 18073)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/swfupload/plugins/swfupload.swfobject.js        2011-05-30 01:29:55 UTC (rev 18072)
+++ trunk/wp-includes/js/swfupload/plugins/swfupload.swfobject.js        2011-05-30 02:23:45 UTC (rev 18073)
</span><span class="lines">@@ -43,13 +43,13 @@
</span><span class="cx"> var SWFUpload;
</span><span class="cx"> if (typeof(SWFUpload) === &quot;function&quot;) {
</span><span class="cx">         SWFUpload.onload = function () {};
</span><del>-        
</del><ins>+
</ins><span class="cx">         swfobject.addDomLoadEvent(function () {
</span><span class="cx">                 if (typeof(SWFUpload.onload) === &quot;function&quot;) {
</span><del>-                        SWFUpload.onload.call(window);
</del><ins>+                        setTimeout(function(){SWFUpload.onload.call(window);}, 200);
</ins><span class="cx">                 }
</span><span class="cx">         });
</span><del>-        
</del><ins>+
</ins><span class="cx">         SWFUpload.prototype.initSettings = (function (oldInitSettings) {
</span><span class="cx">                 return function () {
</span><span class="cx">                         if (typeof(oldInitSettings) === &quot;function&quot;) {
</span></span></pre></div>
<a id="trunkwpincludesjsswfuploadswfuploadalljs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/swfupload/swfupload-all.js (18072 => 18073)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/swfupload/swfupload-all.js        2011-05-30 01:29:55 UTC (rev 18072)
+++ trunk/wp-includes/js/swfupload/swfupload-all.js        2011-05-30 02:23:45 UTC (rev 18073)
</span><span class="lines">@@ -5,4 +5,4 @@
</span><span class="cx"> // swfobject
</span><span class="cx"> var swfobject=function(){var b=&quot;undefined&quot;,Q=&quot;object&quot;,n=&quot;Shockwave Flash&quot;,p=&quot;ShockwaveFlash.ShockwaveFlash&quot;,P=&quot;application/x-shockwave-flash&quot;,m=&quot;SWFObjectExprInst&quot;,j=window,K=document,T=navigator,o=[],N=[],i=[],d=[],J,Z=null,M=null,l=null,e=false,A=false;var h=function(){var v=typeof K.getElementById!=b&amp;&amp;typeof K.getElementsByTagName!=b&amp;&amp;typeof K.createElement!=b,AC=[0,0,0],x=null;if(typeof T.plugins!=b&amp;&amp;typeof T.plugins[n]==Q){x=T.plugins[n].description;if(x&amp;&amp;!(typeof T.mimeTypes!=b&amp;&amp;T.mimeTypes[P]&amp;&amp;!T.mimeTypes[P].enabledPlugin)){x=x.replace(/^.*\s+(\S+\s+\S+$)/,&quot;$1&quot;);AC[0]=parseInt(x.replace(/^(.*)\..*$/,&quot;$1&quot;),10);AC[1]=parseInt(x.replace(/^.*\.(.*)\s.*$/,&quot;$1&quot;),10);AC[2]=/r/.test(x)?parseInt(x.replace(/^.*r(.*)$/,&quot;$1&quot;),10):0}}else{if(typeof j.ActiveXObject!=b){var y=null,AB=false;try{y=new ActiveXObject
 (p+&quot;.7&quot;)}catch(t){try{y=new ActiveXObject(p+&quot;.6&quot;);AC=[6,0,21];y.AllowScriptAccess=&quot;always&quot;}catch(t){if(AC[0]==6){AB=true}}if(!AB){try{y=new ActiveXObject(p)}catch(t){}}}if(!AB&amp;&amp;y){try{x=y.GetVariable(&quot;$version&quot;);if(x){x=x.split(&quot; &quot;)[1].split(&quot;,&quot;);AC=[parseInt(x[0],10),parseInt(x[1],10),parseInt(x[2],10)]}}catch(t){}}}}var AD=T.userAgent.toLowerCase(),r=T.platform.toLowerCase(),AA=/webkit/.test(AD)?parseFloat(AD.replace(/^.*webkit\/(\d+(\.\d+)?).*$/,&quot;$1&quot;)):false,q=false,z=r?/win/.test(r):/win/.test(AD),w=r?/mac/.test(r):/mac/.test(AD);/*@cc_on q=true;@if(@_win32)z=true;@elif(@_mac)w=true;@end@*/return{w3cdom:v,pv:AC,webkit:AA,ie:q,win:z,mac:w}}();var L=function(){if(!h.w3cdom){return }f(H);if(h.ie&amp;&amp;h.win){try{K.write(&quot;&lt;script id=__ie_ondomload defer=true src=//:&gt;&lt;\/script&gt;&quot;);J=C(&quot;__ie_ondomload&quot;);if(J){I(J,&quot;onreadystatechange&quot;,S)}}catch(q){}}if(h.web
 kit&amp;&amp;typeof K.readyState!=b){Z=setInterval(function(){if(/loaded|complete/.test(K.readyState)){E()}},10)}if(typeof K.addEventListener!=b){K.addEventListener(&quot;DOMContentLoaded&quot;,E,null)}R(E)}();function S(){if(J.readyState==&quot;complete&quot;){J.parentNode.removeChild(J);E()}}function E(){if(e){return }if(h.ie&amp;&amp;h.win){var v=a(&quot;span&quot;);try{var u=K.getElementsByTagName(&quot;body&quot;)[0].appendChild(v);u.parentNode.removeChild(u)}catch(w){return }}e=true;if(Z){clearInterval(Z);Z=null}var q=o.length;for(var r=0;r&lt;q;r++){o[r]()}}function f(q){if(e){q()}else{o[o.length]=q}}function R(r){if(typeof j.addEventListener!=b){j.addEventListener(&quot;load&quot;,r,false)}else{if(typeof K.addEventListener!=b){K.addEventListener(&quot;load&quot;,r,false)}else{if(typeof j.attachEvent!=b){I(j,&quot;onload&quot;,r)}else{if(typeof j.onload==&quot;function&quot;){var q=j.onload;j.onload=function(){q();r()}}else{j.onload=r}}}}}function H(){var t=N.length;f
 or(var q=0;q&lt;t;q++){var u=N[q].id;if(h.pv[0]&gt;0){var r=C(u);if(r){N[q].width=r.getAttribute(&quot;width&quot;)?r.getAttribute(&quot;width&quot;):&quot;0&quot;;N[q].height=r.getAttribute(&quot;height&quot;)?r.getAttribute(&quot;height&quot;):&quot;0&quot;;if(c(N[q].swfVersion)){if(h.webkit&amp;&amp;h.webkit&lt;312){Y(r)}W(u,true)}else{if(N[q].expressInstall&amp;&amp;!A&amp;&amp;c(&quot;6.0.65&quot;)&amp;&amp;(h.win||h.mac)){k(N[q])}else{O(r)}}}}else{W(u,true)}}}function Y(t){var q=t.getElementsByTagName(Q)[0];if(q){var w=a(&quot;embed&quot;),y=q.attributes;if(y){var v=y.length;for(var u=0;u&lt;v;u++){if(y[u].nodeName==&quot;DATA&quot;){w.setAttribute(&quot;src&quot;,y[u].nodeValue)}else{w.setAttribute(y[u].nodeName,y[u].nodeValue)}}}var x=q.childNodes;if(x){var z=x.length;for(var r=0;r&lt;z;r++){if(x[r].nodeType==1&amp;&amp;x[r].nodeName==&quot;PARAM&quot;){w.setAttribute(x[r].getAttribute(&quot;name&quot;),x[r].getAttribute(&quot;value&quot;))}}}t.parentNode.replaceChil
 d(w,t)}}function k(w){A=true;var u=C(w.id);if(u){if(w.altContentId){var y=C(w.altContentId);if(y){M=y;l=w.altContentId}}else{M=G(u)}if(!(/%$/.test(w.width))&amp;&amp;parseInt(w.width,10)&lt;310){w.width=&quot;310&quot;}if(!(/%$/.test(w.height))&amp;&amp;parseInt(w.height,10)&lt;137){w.height=&quot;137&quot;}K.title=K.title.slice(0,47)+&quot; - Flash Player Installation&quot;;var z=h.ie&amp;&amp;h.win?&quot;ActiveX&quot;:&quot;PlugIn&quot;,q=K.title,r=&quot;MMredirectURL=&quot;+j.location+&quot;&amp;MMplayerType=&quot;+z+&quot;&amp;MMdoctitle=&quot;+q,x=w.id;if(h.ie&amp;&amp;h.win&amp;&amp;u.readyState!=4){var t=a(&quot;div&quot;);x+=&quot;SWFObjectNew&quot;;t.setAttribute(&quot;id&quot;,x);u.parentNode.insertBefore(t,u);u.style.display=&quot;none&quot;;var v=function(){u.parentNode.removeChild(u)};I(j,&quot;onload&quot;,v)}U({data:w.expressInstall,id:m,width:w.width,height:w.height},{flashvars:r},x)}}function O(t){if(h.ie&amp;&amp;h.win&amp;&amp;t.readyState!=4){var r=a(&quo
 t;div&quot;);t.parentNode.insertBefore(r,t);r.parentNode.replaceChild(G(t),r);t.style.display=&quot;none&quot;;var q=function(){t.parentNode.removeChild(t)};I(j,&quot;onload&quot;,q)}else{t.parentNode.replaceChild(G(t),t)}}function G(v){var u=a(&quot;div&quot;);if(h.win&amp;&amp;h.ie){u.innerHTML=v.innerHTML}else{var r=v.getElementsByTagName(Q)[0];if(r){var w=r.childNodes;if(w){var q=w.length;for(var t=0;t&lt;q;t++){if(!(w[t].nodeType==1&amp;&amp;w[t].nodeName==&quot;PARAM&quot;)&amp;&amp;!(w[t].nodeType==8)){u.appendChild(w[t].cloneNode(true))}}}}}return u}function U(AG,AE,t){var q,v=C(t);if(v){if(typeof AG.id==b){AG.id=t}if(h.ie&amp;&amp;h.win){var AF=&quot;&quot;;for(var AB in AG){if(AG[AB]!=Object.prototype[AB]){if(AB.toLowerCase()==&quot;data&quot;){AE.movie=AG[AB]}else{if(AB.toLowerCase()==&quot;styleclass&quot;){AF+=' class=&quot;'+AG[AB]+'&quot;'}else{if(AB.toLowerCase()!=&quot;classid&quot;){AF+=&quot; &quot;+AB+'=&quot;'+AG[AB]+'&quot;'}}}}}var AD=&quot;&quot;;for(
 var AA in AE){if(AE[AA]!=Object.prototype[AA]){AD+='&lt;param name=&quot;'+AA+'&quot; value=&quot;'+AE[AA]+'&quot; /&gt;'}}v.outerHTML='&lt;object classid=&quot;clsid:D27CDB6E-AE6D-11cf-96B8-444553540000&quot;'+AF+&quot;&gt;&quot;+AD+&quot;&lt;/object&gt;&quot;;i[i.length]=AG.id;q=C(AG.id)}else{if(h.webkit&amp;&amp;h.webkit&lt;312){var AC=a(&quot;embed&quot;);AC.setAttribute(&quot;type&quot;,P);for(var z in AG){if(AG[z]!=Object.prototype[z]){if(z.toLowerCase()==&quot;data&quot;){AC.setAttribute(&quot;src&quot;,AG[z])}else{if(z.toLowerCase()==&quot;styleclass&quot;){AC.setAttribute(&quot;class&quot;,AG[z])}else{if(z.toLowerCase()!=&quot;classid&quot;){AC.setAttribute(z,AG[z])}}}}}for(var y in AE){if(AE[y]!=Object.prototype[y]){if(y.toLowerCase()!=&quot;movie&quot;){AC.setAttribute(y,AE[y])}}}v.parentNode.replaceChild(AC,v);q=AC}else{var u=a(Q);u.setAttribute(&quot;type&quot;,P);for(var x in AG){if(AG[x]!=Object.prototype[x]){if(x.toLowerCase()==&quot;styleclass&quot;){u.setAt
 tribute(&quot;class&quot;,AG[x])}else{if(x.toLowerCase()!=&quot;classid&quot;){u.setAttribute(x,AG[x])}}}}for(var w in AE){if(AE[w]!=Object.prototype[w]&amp;&amp;w.toLowerCase()!=&quot;movie&quot;){F(u,w,AE[w])}}v.parentNode.replaceChild(u,v);q=u}}}return q}function F(t,q,r){var u=a(&quot;param&quot;);u.setAttribute(&quot;name&quot;,q);u.setAttribute(&quot;value&quot;,r);t.appendChild(u)}function X(r){var q=C(r);if(q&amp;&amp;(q.nodeName==&quot;OBJECT&quot;||q.nodeName==&quot;EMBED&quot;)){if(h.ie&amp;&amp;h.win){if(q.readyState==4){B(r)}else{j.attachEvent(&quot;onload&quot;,function(){B(r)})}}else{q.parentNode.removeChild(q)}}}function B(t){var r=C(t);if(r){for(var q in r){if(typeof r[q]==&quot;function&quot;){r[q]=null}}r.parentNode.removeChild(r)}}function C(t){var q=null;try{q=K.getElementById(t)}catch(r){}return q}function a(q){return K.createElement(q)}function I(t,q,r){t.attachEvent(q,r);d[d.length]=[t,q,r]}function c(t){var r=h.pv,q=t.split(&quot;.&quot;);q[0]=parseI
 nt(q[0],10);q[1]=parseInt(q[1],10)||0;q[2]=parseInt(q[2],10)||0;return(r[0]&gt;q[0]||(r[0]==q[0]&amp;&amp;r[1]&gt;q[1])||(r[0]==q[0]&amp;&amp;r[1]==q[1]&amp;&amp;r[2]&gt;=q[2]))?true:false}function V(v,r){if(h.ie&amp;&amp;h.mac){return }var u=K.getElementsByTagName(&quot;head&quot;)[0],t=a(&quot;style&quot;);t.setAttribute(&quot;type&quot;,&quot;text/css&quot;);t.setAttribute(&quot;media&quot;,&quot;screen&quot;);if(!(h.ie&amp;&amp;h.win)&amp;&amp;typeof K.createTextNode!=b){t.appendChild(K.createTextNode(v+&quot; {&quot;+r+&quot;}&quot;))}u.appendChild(t);if(h.ie&amp;&amp;h.win&amp;&amp;typeof K.styleSheets!=b&amp;&amp;K.styleSheets.length&gt;0){var q=K.styleSheets[K.styleSheets.length-1];if(typeof q.addRule==Q){q.addRule(v,r)}}}function W(t,q){var r=q?&quot;visible&quot;:&quot;hidden&quot;;if(e&amp;&amp;C(t)){C(t).style.visibility=r}else{V(&quot;#&quot;+t,&quot;visibility:&quot;+r)}}function g(s){var r=/[\\\&quot;&lt;&gt;\.;]/;var q=r.exec(s)!=null;return q?encodeURICompon
 ent(s):s}var D=function(){if(h.ie&amp;&amp;h.win){window.attachEvent(&quot;onunload&quot;,function(){var w=d.length;for(var v=0;v&lt;w;v++){d[v][0].detachEvent(d[v][1],d[v][2])}var t=i.length;for(var u=0;u&lt;t;u++){X(i[u])}for(var r in h){h[r]=null}h=null;for(var q in swfobject){swfobject[q]=null}swfobject=null})}}();return{registerObject:function(u,q,t){if(!h.w3cdom||!u||!q){return }var r={};r.id=u;r.swfVersion=q;r.expressInstall=t?t:false;N[N.length]=r;W(u,false)},getObjectById:function(v){var q=null;if(h.w3cdom){var t=C(v);if(t){var u=t.getElementsByTagName(Q)[0];if(!u||(u&amp;&amp;typeof t.SetVariable!=b)){q=t}else{if(typeof u.SetVariable!=b){q=u}}}}return q},embedSWF:function(x,AE,AB,AD,q,w,r,z,AC){if(!h.w3cdom||!x||!AE||!AB||!AD||!q){return }AB+=&quot;&quot;;AD+=&quot;&quot;;if(c(q)){W(AE,false);var AA={};if(AC&amp;&amp;typeof AC===Q){for(var v in AC){if(AC[v]!=Object.prototype[v]){AA[v]=AC[v]}}}AA.data=x;AA.width=AB;AA.height=AD;var y={};if(z&amp;&amp;typeof z===Q){f
 or(var u in z){if(z[u]!=Object.prototype[u]){y[u]=z[u]}}}if(r&amp;&amp;typeof r===Q){for(var t in r){if(r[t]!=Object.prototype[t]){if(typeof y.flashvars!=b){y.flashvars+=&quot;&amp;&quot;+t+&quot;=&quot;+r[t]}else{y.flashvars=t+&quot;=&quot;+r[t]}}}}f(function(){U(AA,y,AE);if(AA.id==AE){W(AE,true)}})}else{if(w&amp;&amp;!A&amp;&amp;c(&quot;6.0.65&quot;)&amp;&amp;(h.win||h.mac)){A=true;W(AE,false);f(function(){var AF={};AF.id=AF.altContentId=AE;AF.width=AB;AF.height=AD;AF.expressInstall=w;k(AF)})}}},getFlashPlayerVersion:function(){return{major:h.pv[0],minor:h.pv[1],release:h.pv[2]}},hasFlashPlayerVersion:c,createSWF:function(t,r,q){if(h.w3cdom){return U(t,r,q)}else{return undefined}},removeSWF:function(q){if(h.w3cdom){X(q)}},createCSS:function(r,q){if(h.w3cdom){V(r,q)}},addDomLoadEvent:f,addLoadEvent:R,getQueryParamValue:function(v){var u=K.location.search||K.location.hash;if(v==null){return g(u)}if(u){var t=u.substring(1).split(&quot;&amp;&quot;);for(var r=0;r&lt;t.length;r+
 +){if(t[r].substring(0,t[r].indexOf(&quot;=&quot;))==v){return g(t[r].substring((t[r].indexOf(&quot;=&quot;)+1)))}}}return&quot;&quot;},expressInstallCallback:function(){if(A&amp;&amp;M){var q=C(m);if(q){q.parentNode.replaceChild(M,q);if(l){W(l,true);if(h.ie&amp;&amp;h.win){M.style.display=&quot;block&quot;}}M=null;l=null;A=false}}}}}();
</span><span class="cx"> // swfupload.swfobject
</span><del>-var SWFUpload;if(typeof(SWFUpload)===&quot;function&quot;){SWFUpload.onload=function(){};swfobject.addDomLoadEvent(function(){if(typeof(SWFUpload.onload)===&quot;function&quot;){SWFUpload.onload.call(window)}});SWFUpload.prototype.initSettings=(function(a){return function(){if(typeof(a)===&quot;function&quot;){a.call(this)}this.ensureDefault=function(c,b){this.settings[c]=(this.settings[c]==undefined)?b:this.settings[c]};this.ensureDefault(&quot;minimum_flash_version&quot;,&quot;9.0.28&quot;);this.ensureDefault(&quot;swfupload_pre_load_handler&quot;,null);this.ensureDefault(&quot;swfupload_load_failed_handler&quot;,null);delete this.ensureDefault}})(SWFUpload.prototype.initSettings);SWFUpload.prototype.loadFlash=function(a){return function(){var b=swfobject.hasFlashPlayerVersion(this.settings.minimum_flash_version);if(b){this.queueEvent(&quot;swfupload_pre_load_handler&quot;);if(typeof(a)===&quot;function&quot;){a.call(this)}}else{this.queueEvent(&quot;swfupload_
 load_failed_handler&quot;)}}}(SWFUpload.prototype.loadFlash)};
</del><ins>+var SWFUpload;if(typeof(SWFUpload)===&quot;function&quot;){SWFUpload.onload=function(){};swfobject.addDomLoadEvent(function(){if(typeof(SWFUpload.onload)===&quot;function&quot;){setTimeout(function(){SWFUpload.onload.call(window)},200)}});SWFUpload.prototype.initSettings=(function(a){return function(){if(typeof(a)===&quot;function&quot;){a.call(this)}this.ensureDefault=function(c,b){this.settings[c]=(this.settings[c]==undefined)?b:this.settings[c]};this.ensureDefault(&quot;minimum_flash_version&quot;,&quot;9.0.28&quot;);this.ensureDefault(&quot;swfupload_pre_load_handler&quot;,null);this.ensureDefault(&quot;swfupload_load_failed_handler&quot;,null);delete this.ensureDefault}})(SWFUpload.prototype.initSettings);SWFUpload.prototype.loadFlash=function(a){return function(){var b=swfobject.hasFlashPlayerVersion(this.settings.minimum_flash_version);if(b){this.queueEvent(&quot;swfupload_pre_load_handler&quot;);if(typeof(a)===&quot;function&quot;){a.call(this)}}else{this.
 queueEvent(&quot;swfupload_load_failed_handler&quot;)}}}(SWFUpload.prototype.loadFlash);SWFUpload.prototype.displayDebugInfo=function(a){return function(){if(typeof(a)===&quot;function&quot;){a.call(this)}this.debug([&quot;SWFUpload.SWFObject Plugin settings:&quot;,&quot;\n&quot;,&quot;\t&quot;,&quot;minimum_flash_version:                      &quot;,this.settings.minimum_flash_version,&quot;\n&quot;,&quot;\t&quot;,&quot;swfupload_pre_load_handler assigned:     &quot;,(typeof(this.settings.swfupload_pre_load_handler)===&quot;function&quot;).toString(),&quot;\n&quot;,&quot;\t&quot;,&quot;swfupload_load_failed_handler assigned:     &quot;,(typeof(this.settings.swfupload_load_failed_handler)===&quot;function&quot;).toString(),&quot;\n&quot;,].join(&quot;&quot;))}}(SWFUpload.prototype.displayDebugInfo)};
</ins></span></pre></div>
<a id="trunkwpincludesscriptloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/script-loader.php (18072 => 18073)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/script-loader.php        2011-05-30 01:29:55 UTC (rev 18072)
+++ trunk/wp-includes/script-loader.php        2011-05-30 02:23:45 UTC (rev 18073)
</span><span class="lines">@@ -209,7 +209,7 @@
</span><span class="cx">         $scripts-&gt;add( 'swfobject', &quot;/wp-includes/js/swfobject.js&quot;, false, '2.2');
</span><span class="cx"> 
</span><span class="cx">         $scripts-&gt;add( 'swfupload', '/wp-includes/js/swfupload/swfupload.js', false, '2201-20110113');
</span><del>-        $scripts-&gt;add( 'swfupload-swfobject', '/wp-includes/js/swfupload/plugins/swfupload.swfobject.js', array('swfupload', 'swfobject'), '2201');
</del><ins>+        $scripts-&gt;add( 'swfupload-swfobject', '/wp-includes/js/swfupload/plugins/swfupload.swfobject.js', array('swfupload', 'swfobject'), '2201a');
</ins><span class="cx">         $scripts-&gt;add( 'swfupload-queue', '/wp-includes/js/swfupload/plugins/swfupload.queue.js', array('swfupload'), '2201');
</span><span class="cx">         $scripts-&gt;add( 'swfupload-speed', '/wp-includes/js/swfupload/plugins/swfupload.speed.js', array('swfupload'), '2201');
</span><span class="cx"> 
</span><span class="lines">@@ -217,7 +217,7 @@
</span><span class="cx">                 // queue all SWFUpload scripts that are used by default
</span><span class="cx">                 $scripts-&gt;add( 'swfupload-all', false, array('swfupload', 'swfupload-swfobject', 'swfupload-queue'), '2201');
</span><span class="cx">         } else {
</span><del>-                $scripts-&gt;add( 'swfupload-all', '/wp-includes/js/swfupload/swfupload-all.js', array(), '2201');
</del><ins>+                $scripts-&gt;add( 'swfupload-all', '/wp-includes/js/swfupload/swfupload-all.js', array(), '2201a');
</ins><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx">         $scripts-&gt;add( 'swfupload-handlers', &quot;/wp-includes/js/swfupload/handlers$suffix.js&quot;, array('swfupload-all', 'jquery'), '2201-20110524');
</span></span></pre>
</div>
</div>

</body>
</html>