<!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>[23970] trunk: Compress scripts/styles: 3.6-beta1-23970.</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://core.trac.wordpress.org/changeset/23970">23970</a></dd>
<dt>Author</dt> <dd>bumpbot</dd>
<dt>Date</dt> <dd>2013-04-11 22:58:39 +0000 (Thu, 11 Apr 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>Compress scripts/styles: 3.6-beta1-23970.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminjspostformatsminjs">trunk/wp-admin/js/post-formats.min.js</a></li>
<li><a href="#trunkwpincludesjsmediaeditorminjs">trunk/wp-includes/js/media-editor.min.js</a></li>
<li><a href="#trunkwpincludesversionphp">trunk/wp-includes/version.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminjspostformatsminjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/js/post-formats.min.js (23969 => 23970)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/post-formats.min.js        2013-04-11 22:34:05 UTC (rev 23969)
+++ trunk/wp-admin/js/post-formats.min.js        2013-04-11 22:58:39 UTC (rev 23970)
</span><span class="lines">@@ -1 +1 @@
</span><del>-window.wp=window.wp||{};(function(g){var c,b,a,h,f,e=[&quot;standard&quot;,&quot;chat&quot;,&quot;status&quot;,&quot;aside&quot;,&quot;gallery&quot;];function d(i){c.get(0).className=c.get(0).className.replace(/\bwp-format-[^ ]+/,&quot;&quot;);c.addClass(&quot;wp-format-&quot;+i)}g(function(){var i=g(&quot;.post-formats-fields&quot;);g(&quot;.post-format-options&quot;).on(&quot;click&quot;,&quot;a&quot;,function(p){p.preventDefault();var o=g(this),l,j,k=o.parent(),n=o.data(&quot;wp-format&quot;),m=g(&quot;.post-format-description&quot;);if(typeof c===&quot;undefined&quot;){c=g(&quot;#post-body-content&quot;)}if(n===postFormats.currentPostFormat){return}k.find(&quot;a.active&quot;).removeClass(&quot;active&quot;);o.addClass(&quot;active&quot;);g(&quot;#icon-edit&quot;).removeClass(postFormats.currentPostFormat).addClass(n);g(&quot;#post_format&quot;).val(n);if(-1&lt;g.inArray(n,e)&amp;&amp;-1&lt;g.inArray(postFormats.currentPostFormat,e)){d(n)}else{i.slideUp(200,f
 unction(){d(n);i.slideDown(400)})}g(&quot;#title&quot;).focus();m.html(o.data(&quot;description&quot;));if(m.not(&quot;:visible&quot;)){m.slideDown(&quot;fast&quot;)}if(typeof tinymce!=&quot;undefined&quot;){l=tinymce.get(&quot;content&quot;);if(l){j=l.getBody();j.className=j.className.replace(/\bpost-format-[^ ]+/,&quot;&quot;);l.dom.addClass(j,&quot;post-format-&quot;+n)}}postFormats.currentPostFormat=n}).on(&quot;mouseenter focusin&quot;,&quot;a&quot;,function(){g(&quot;.post-format-tip&quot;).html(g(this).prop(&quot;title&quot;))}).on(&quot;mouseleave focusout&quot;,&quot;a&quot;,function(){g(&quot;.post-format-tip&quot;).html(g(&quot;.post-format-options a.active&quot;).prop(&quot;title&quot;))});g(&quot;.wp-format-media-select&quot;).click(function(l){l.preventDefault();var j=g(this),n,k,m=&quot;image&quot;,o=&quot;&quot;,n=j.closest(&quot;.wp-format-media-holder&quot;),k=g(&quot;#wp_format_&quot;+n.data(&quot;format&quot;));switch(n.data(&quot;format&quot;)){case&quot
 ;audio&quot;:m=&quot;audio&quot;;break;case&quot;video&quot;:m=&quot;video&quot;;break}if(b&amp;&amp;a===m&amp;&amp;h===o){b.open();return}a=m;h=o;b=wp.media.frames.formatMedia=wp.media({title:j.data(&quot;choose&quot;),toolbar:o,library:{type:m},button:{text:j.data(&quot;update&quot;)}});f=function(r,p,q){g(&quot;#&quot;+r+&quot;-preview&quot;).remove();n.parent().prepend('&lt;div id=&quot;'+r+'-preview&quot; class=&quot;wp-format-media-preview&quot;&gt;&lt;'+r+' class=&quot;wp-'+r+'-shortcode&quot; controls=&quot;controls&quot; preload=&quot;none&quot;&gt;&lt;source type=&quot;'+q+'&quot; src=&quot;'+p+'&quot; /&gt;&lt;/'+r+&quot;&gt;&lt;/div&gt;&quot;);g(&quot;.wp-&quot;+r+&quot;-shortcode&quot;).mediaelementplayer()};b.on(&quot;select&quot;,function(){var r=b.state().get(&quot;selection&quot;).first(),q,p,s;s=r.get(&quot;id&quot;);p=r.get(&quot;url&quot;);q=r.get(&quot;mime&quot;);if(0===q.indexOf(&quot;audio&quot;)){k.val(p);f(&quot;audio&quot;,p,q)}else{if(0===q.indexO
 f(&quot;video&quot;)){k.val(p);f(&quot;video&quot;,p,q)}else{k.val(s);j.html('&lt;img src=&quot;'+p+'&quot; /&gt;');n.removeClass(&quot;empty&quot;).show()}}});b.open()})})})(jQuery);
</del><span class="cx">\ No newline at end of file
</span><ins>+window.wp=window.wp||{};(function(g){var c,b,a,h,f,e=[&quot;standard&quot;,&quot;chat&quot;,&quot;status&quot;,&quot;aside&quot;,&quot;gallery&quot;];function d(i){c.get(0).className=c.get(0).className.replace(/\bwp-format-[^ ]+/,&quot;&quot;);c.addClass(&quot;wp-format-&quot;+i)}g(function(){var i=g(&quot;.post-formats-fields&quot;);g(&quot;.post-format-options&quot;).on(&quot;click&quot;,&quot;a&quot;,function(p){p.preventDefault();var o=g(this),l,j,k=o.parent(),n=o.data(&quot;wp-format&quot;),m=g(&quot;.post-format-description&quot;);if(typeof c===&quot;undefined&quot;){c=g(&quot;#post-body-content&quot;)}if(n===postFormats.currentPostFormat){return}k.find(&quot;a.active&quot;).removeClass(&quot;active&quot;);o.addClass(&quot;active&quot;);g(&quot;#icon-edit&quot;).removeClass(postFormats.currentPostFormat).addClass(n);g(&quot;#post_format&quot;).val(n);if(-1&lt;g.inArray(n,e)&amp;&amp;-1&lt;g.inArray(postFormats.currentPostFormat,e)){d(n)}else{i.slideUp(200,f
 unction(){d(n);i.slideDown(400)})}g(&quot;#title&quot;).focus();m.html(o.data(&quot;description&quot;));if(m.not(&quot;:visible&quot;)){m.slideDown(&quot;fast&quot;)}if(typeof tinymce!=&quot;undefined&quot;){l=tinymce.get(&quot;content&quot;);if(l){j=l.getBody();j.className=j.className.replace(/\bpost-format-[^ ]+/,&quot;&quot;);l.dom.addClass(j,&quot;post-format-&quot;+n)}}postFormats.currentPostFormat=n}).on(&quot;mouseenter focusin&quot;,&quot;a&quot;,function(){g(&quot;.post-format-tip&quot;).html(g(this).prop(&quot;title&quot;))}).on(&quot;mouseleave focusout&quot;,&quot;a&quot;,function(){g(&quot;.post-format-tip&quot;).html(g(&quot;.post-format-options a.active&quot;).prop(&quot;title&quot;))});g(&quot;.wp-format-media-select&quot;).click(function(l){l.preventDefault();var j=g(this),n,k,m=&quot;image&quot;,o=&quot;&quot;,n=j.closest(&quot;.wp-format-media-holder&quot;),k=g(&quot;#wp_format_&quot;+n.data(&quot;format&quot;));switch(n.data(&quot;format&quot;)){case&quot
 ;audio&quot;:m=&quot;audio&quot;;break;case&quot;video&quot;:m=&quot;video&quot;;break}if(b&amp;&amp;a===m&amp;&amp;h===o){b.open();return}a=m;h=o;b=wp.media.frames.formatMedia=wp.media({title:j.data(&quot;choose&quot;),toolbar:o,library:{type:m},button:{text:j.data(&quot;update&quot;)}});f=function(t){var q=&quot;&quot;,p=t.url,r=t.mime,s=t.type;if(&quot;video&quot;===s){if(t.width){q+=' width=&quot;'+t.width+'&quot;'}if(t.height){q+=' height=&quot;'+t.height+'&quot;'}}g(&quot;#&quot;+s+&quot;-preview&quot;).remove();n.parent().prepend('&lt;div id=&quot;'+s+'-preview&quot; class=&quot;wp-format-media-preview&quot;&gt;&lt;'+s+q+' class=&quot;wp-'+s+'-shortcode&quot; controls=&quot;controls&quot; preload=&quot;none&quot;&gt;&lt;source type=&quot;'+r+'&quot; src=&quot;'+p+'&quot; /&gt;&lt;/'+s+&quot;&gt;&lt;/div&gt;&quot;);g(&quot;.wp-&quot;+s+&quot;-shortcode&quot;).mediaelementplayer()};b.on(&quot;select&quot;,function(){var p=b.state().get(&quot;selection&quot;).first().toJ
 SON();if(0===p.mime.indexOf(&quot;audio&quot;)){k.val(p.url);f(p)}else{if(0===p.mime.indexOf(&quot;video&quot;)){p.src=p.url;k.val(wp.shortcode.string({tag:&quot;video&quot;,attrs:_.pick(p,&quot;src&quot;,&quot;width&quot;,&quot;height&quot;)}));f(p)}else{k.val(p.id);j.html('&lt;img src=&quot;'+p.url+'&quot; /&gt;');n.removeClass(&quot;empty&quot;).show()}}});b.open()})})})(jQuery);
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpincludesjsmediaeditorminjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/media-editor.min.js (23969 => 23970)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/media-editor.min.js        2013-04-11 22:34:05 UTC (rev 23969)
+++ trunk/wp-includes/js/media-editor.min.js        2013-04-11 22:58:39 UTC (rev 23970)
</span><span class="lines">@@ -1 +1 @@
</span><del>-(function(b){var a={};wp.media.string={props:function(f,i){var h,c,e,g,d,j=wp.media.view.settings.defaultProps;d=function(k){if(&quot;image&quot;===k.type&amp;&amp;!k.alt){k.alt=k.caption||k.title||&quot;&quot;;k.alt=k.alt.replace(/&lt;\/?[^&gt;]+&gt;/g,&quot;&quot;);k.alt=k.alt.replace(/[\r\n]+/g,&quot; &quot;)}return k};f=f?_.clone(f):{};if(i&amp;&amp;i.type){f.type=i.type}if(&quot;image&quot;===f.type){f=_.defaults(f||{},{align:j.align||getUserSetting(&quot;align&quot;,&quot;none&quot;),size:j.size||getUserSetting(&quot;imgsize&quot;,&quot;medium&quot;),url:&quot;&quot;,classes:[]})}if(!i){return d(f)}f.title=f.title||i.title;h=f.link||j.link||getUserSetting(&quot;urlbutton&quot;,&quot;file&quot;);if(&quot;file&quot;===h){c=i.url}else{if(&quot;post&quot;===h){c=i.link}else{if(&quot;custom&quot;===h){c=f.linkUrl}}}f.linkUrl=c||&quot;&quot;;if(&quot;image&quot;===i.type){f.classes.push(&quot;wp-image-&quot;+i.id);g=i.sizes;e=g&amp;&amp;g[f.size]?g[f.size]:i;_.ex
 tend(f,_.pick(i,&quot;align&quot;,&quot;caption&quot;,&quot;alt&quot;),{width:e.width,height:e.height,src:e.url,captionId:&quot;attachment_&quot;+i.id})}else{if(&quot;video&quot;===i.type||&quot;audio&quot;===i.type){_.extend(f,_.pick(i,&quot;title&quot;,&quot;type&quot;,&quot;icon&quot;,&quot;mime&quot;))}else{f.title=f.title||i.filename;f.rel=f.rel||&quot;attachment wp-att-&quot;+i.id}}return d(f)},link:function(d,e){var c;d=wp.media.string.props(d,e);c={tag:&quot;a&quot;,content:d.title,attrs:{href:d.linkUrl}};if(d.rel){c.attrs.rel=d.rel}return wp.html.string(c)},audio:function(d,f){var e,c;d=wp.media.string.props(d,f);e={};if(d.mime){switch(d.mime){case&quot;audio/mpeg&quot;:if(f.url.indexOf(&quot;mp3&quot;)){e.mp3=f.url}else{if(f.url.indexOf(&quot;m4a&quot;)){e.m4a=f.url}}break;case&quot;audio/mp3&quot;:e.mp3=f.url;break;case&quot;audio/m4a&quot;:e.m4a=f.url;break;case&quot;audio/wav&quot;:e.wav=f.url;break;case&quot;audio/ogg&quot;:e.ogg=f.url;break;case&quot;audio/x-m
 s-wma&quot;:case&quot;audio/wma&quot;:e.wma=f.url;break}}c=wp.shortcode.string({tag:&quot;audio&quot;,attrs:e});return c},video:function(d,f){var e,c;d=wp.media.string.props(d,f);e={};if(d.mime){switch(d.mime){case&quot;video/mp4&quot;:e.mp4=f.url;break;case&quot;video/m4v&quot;:e.m4v=f.url;break;case&quot;video/webm&quot;:e.webm=f.url;break;case&quot;video/ogg&quot;:e.ogv=f.url;break;case&quot;video/x-ms-wmv&quot;:case&quot;video/wmv&quot;:case&quot;video/asf&quot;:e.wmv=f.url;break;case&quot;video/flv&quot;:case&quot;video/x-flv&quot;:e.flv=f.url;break}}c=wp.shortcode.string({tag:&quot;video&quot;,attrs:e});return c},image:function(g,i){var c={},d,f,h,e;g=wp.media.string.props(g,i);f=g.classes||[];c.src=g.url;_.extend(c,_.pick(g,&quot;width&quot;,&quot;height&quot;,&quot;alt&quot;));if(g.align&amp;&amp;!g.caption){f.push(&quot;align&quot;+g.align)}if(g.size){f.push(&quot;size-&quot;+g.size)}c[&quot;class&quot;]=_.compact(f).join(&quot; &quot;);d={tag:&quot;img&quot;,attrs:
 c,single:true};if(g.linkUrl){d={tag:&quot;a&quot;,attrs:{href:g.linkUrl},content:d}}e=wp.html.string(d);if(g.caption){h={};if(c.width){h.width=c.width}if(g.captionId){h.id=g.captionId}if(g.align){h.align=&quot;align&quot;+g.align}e=wp.shortcode.string({tag:&quot;caption&quot;,attrs:h,content:e+&quot; &quot;+g.caption})}return e}};wp.media.gallery=(function(){var c={};return{defaults:{order:&quot;ASC&quot;,id:wp.media.view.settings.post.id,itemtag:&quot;dl&quot;,icontag:&quot;dt&quot;,captiontag:&quot;dd&quot;,columns:&quot;3&quot;,size:&quot;thumbnail&quot;,orderby:&quot;menu_order ID&quot;},attachments:function(h){var j=h.string(),d=c[j],f,e,i,g;delete c[j];if(d){return d}f=_.defaults(h.attrs.named,wp.media.gallery.defaults);e=_.pick(f,&quot;orderby&quot;,&quot;order&quot;);e.type=&quot;image&quot;;e.perPage=-1;if(&quot;rand&quot;===f.orderby){f._orderbyRandom=true}if(!f.orderby||/^menu_order(?: ID)?$/i.test(f.orderby)){e.orderby=&quot;menuOrder&quot;}if(f.ids){e.post__in=f
 .ids.split(&quot;,&quot;);e.orderby=&quot;post__in&quot;}else{if(f.include){e.post__in=f.include.split(&quot;,&quot;)}}if(f.exclude){e.post__not_in=f.exclude.split(&quot;,&quot;)}if(!e.post__in){e.uploadedTo=f.id}g=_.omit(f,&quot;id&quot;,&quot;ids&quot;,&quot;include&quot;,&quot;exclude&quot;,&quot;orderby&quot;,&quot;order&quot;);i=wp.media.query(e);i.gallery=new Backbone.Model(g);return i},shortcode:function(d){var f=d.props.toJSON(),e=_.pick(f,&quot;orderby&quot;,&quot;order&quot;),g,h;if(d.gallery){_.extend(e,d.gallery.toJSON())}e.ids=d.pluck(&quot;id&quot;);if(f.uploadedTo){e.id=f.uploadedTo}if(e._orderbyRandom){e.orderby=&quot;rand&quot;}delete e._orderbyRandom;if(e.ids&amp;&amp;&quot;post__in&quot;===e.orderby){delete e.orderby}_.each(wp.media.gallery.defaults,function(j,i){if(j===e[i]){delete e[i]}});g=new wp.shortcode({tag:&quot;gallery&quot;,attrs:e,type:&quot;single&quot;});h=new wp.media.model.Attachments(d.models,{props:f});h.gallery=d.gallery;c[g.string()]=h;r
 eturn g},edit:function(g){var f=wp.shortcode.next(&quot;gallery&quot;,g),h=wp.media.gallery.defaults.id,d,e;if(!f||f.content!==g){return}f=f.shortcode;if(_.isUndefined(f.get(&quot;id&quot;))&amp;&amp;!_.isUndefined(h)){f.set(&quot;id&quot;,h)}d=wp.media.gallery.attachments(f);e=new wp.media.model.Selection(d.models,{props:d.props.toJSON(),multiple:true});e.gallery=d.gallery;e.more().done(function(){e.props.set({query:false});e.unmirror();e.props.unset(&quot;orderby&quot;)});if(this.frame){this.frame.dispose()}this.frame=wp.media({frame:&quot;post&quot;,state:&quot;gallery-edit&quot;,title:wp.media.view.l10n.editGalleryTitle,editing:true,multiple:true,selection:e}).open();return this.frame}}}());wp.media.featuredImage={get:function(){return wp.media.view.settings.post.featuredImageId},set:function(d){var c=wp.media.view.settings;c.post.featuredImageId=d;wp.media.post(&quot;set-post-thumbnail&quot;,{json:true,post_id:c.post.id,thumbnail_id:c.post.featuredImageId,_wpnonce:c.pos
 t.nonce}).done(function(e){b(&quot;.inside&quot;,&quot;#postimagediv&quot;).html(e)})},frame:function(){if(this._frame){return this._frame}this._frame=wp.media({state:&quot;featured-image&quot;,states:[new wp.media.controller.FeaturedImage()]});this._frame.on(&quot;toolbar:create:featured-image&quot;,function(c){this.createSelectToolbar(c,{text:wp.media.view.l10n.setFeaturedImage})},this._frame);this._frame.state(&quot;featured-image&quot;).on(&quot;select&quot;,this.select);return this._frame},select:function(){var d=wp.media.view.settings,c=this.get(&quot;selection&quot;).single();if(!d.post.featuredImageId){return}wp.media.featuredImage.set(c?c.id:-1)},init:function(){b(&quot;#postimagediv&quot;).on(&quot;click&quot;,&quot;#set-post-thumbnail&quot;,function(c){c.preventDefault();c.stopPropagation();wp.media.featuredImage.frame().open()}).on(&quot;click&quot;,&quot;#remove-post-thumbnail&quot;,function(){wp.media.view.settings.post.featuredImageId=-1})}};b(wp.media.feature
 dImage.init);wp.media.editor={insert:function(g){var d=typeof(tinymce)!=&quot;undefined&quot;,j=typeof(QTags)!=&quot;undefined&quot;,c=window.wpActiveEditor,f;if(window.send_to_editor){return window.send_to_editor.apply(this,arguments)}if(!c){if(d&amp;&amp;tinymce.activeEditor){f=tinymce.activeEditor;c=window.wpActiveEditor=f.id}else{if(!j){return false}}}else{if(d){if(tinymce.activeEditor&amp;&amp;(tinymce.activeEditor.id==&quot;mce_fullscreen&quot;||tinymce.activeEditor.id==&quot;wp_mce_fullscreen&quot;)){f=tinymce.activeEditor}else{f=tinymce.get(c)}}}if(f&amp;&amp;!f.isHidden()){if(tinymce.isIE&amp;&amp;f.windowManager.insertimagebookmark){f.selection.moveToBookmark(f.windowManager.insertimagebookmark)}if(g.indexOf(&quot;[caption&quot;)!==-1){if(f.wpSetImgCaption){g=f.wpSetImgCaption(g)}}else{if(g.indexOf(&quot;[gallery&quot;)!==-1){if(f.plugins.wpgallery){g=f.plugins.wpgallery._do_gallery(g)}}else{if(g.indexOf(&quot;[embed&quot;)===0){if(f.plugins.wordpress){g=f.plugins.
 wordpress._setEmbed(g)}}}}f.execCommand(&quot;mceInsertContent&quot;,false,g)}else{if(j){QTags.insertContent(g)}else{document.getElementById(c).value+=g}}if(window.tb_remove){try{window.tb_remove()}catch(i){}}},add:function(e,c){var d=this.get(e);if(d){return d}d=a[e]=wp.media(_.defaults(c||{},{frame:&quot;post&quot;,state:&quot;insert&quot;,title:wp.media.view.l10n.addMedia,multiple:true}));d.on(&quot;insert&quot;,function(f){var g=d.state();f=f||g.get(&quot;selection&quot;);if(!f){return}b.when.apply(b,f.map(function(i){var h=g.display(i).toJSON();return this.send.attachment(h,i.toJSON())},this)).done(function(){wp.media.editor.insert(_.toArray(arguments).join(&quot;\n\n&quot;))})},this);d.state(&quot;gallery-edit&quot;).on(&quot;update&quot;,function(f){this.insert(wp.media.gallery.shortcode(f).string())},this);d.state(&quot;embed&quot;).on(&quot;select&quot;,function(){var g=d.state(),f=g.get(&quot;type&quot;),h=g.props.toJSON();h.url=h.url||&quot;&quot;;if(&quot;link&qu
 ot;===f){_.defaults(h,{title:h.url,linkUrl:h.url});this.send.link(h).done(function(i){wp.media.editor.insert(i)})}else{if(&quot;image&quot;===f){_.defaults(h,{title:h.url,linkUrl:&quot;&quot;,align:&quot;none&quot;,link:&quot;none&quot;});if(&quot;none&quot;===h.link){h.linkUrl=&quot;&quot;}else{if(&quot;file&quot;===h.link){h.linkUrl=h.url}}this.insert(wp.media.string.image(h))}}},this);d.state(&quot;featured-image&quot;).on(&quot;select&quot;,wp.media.featuredImage.select);d.setState(d.options.state);return d},id:function(c){if(c){return c}c=wpActiveEditor;if(!c&amp;&amp;typeof tinymce!==&quot;undefined&quot;&amp;&amp;tinymce.activeEditor){c=tinymce.activeEditor.id}c=c||&quot;&quot;;return c},get:function(c){c=this.id(c);return a[c]},remove:function(c){c=this.id(c);delete a[c]},send:{attachment:function(f,g){var c=g.caption,d,e;if(!wp.media.view.settings.captions){delete g.caption}f=wp.media.string.props(f,g);d={id:g.id,post_content:g.description,post_excerpt:c};if(f.linkU
 rl){d.url=f.linkUrl}if(&quot;image&quot;===g.type){e=wp.media.string.image(f);_.each({align:&quot;align&quot;,size:&quot;image-size&quot;,alt:&quot;image_alt&quot;},function(h,i){if(f[i]){d[h]=f[i]}})}else{if(&quot;video&quot;===g.type){e=wp.media.string.video(f,g)}else{if(&quot;audio&quot;===g.type){e=wp.media.string.audio(f,g)}else{e=wp.media.string.link(f);d.post_title=f.title}}}return wp.media.post(&quot;send-attachment-to-editor&quot;,{nonce:wp.media.view.settings.nonce.sendToEditor,attachment:d,html:e,post_id:wp.media.view.settings.post.id})},link:function(c){return wp.media.post(&quot;send-link-to-editor&quot;,{nonce:wp.media.view.settings.nonce.sendToEditor,src:c.linkUrl,title:c.title,html:wp.media.string.link(c),post_id:wp.media.view.settings.post.id})}},open:function(e){var d,c;e=this.id(e);if(typeof tinymce!==&quot;undefined&quot;){c=tinymce.get(e);if(tinymce.isIE&amp;&amp;c&amp;&amp;!c.isHidden()){c.focus();c.windowManager.insertimagebookmark=c.selection.getBookm
 ark()}}d=this.get(e);if(!d){d=this.add(e)}return d.open()},init:function(){b(document.body).on(&quot;click&quot;,&quot;.insert-media&quot;,function(d){var e=b(this),c=e.data(&quot;editor&quot;);d.preventDefault();e.blur();wp.media.editor.open(c)})}};_.bindAll(wp.media.editor,&quot;open&quot;);b(wp.media.editor.init)}(jQuery));
</del><span class="cx">\ No newline at end of file
</span><ins>+(function(b){var a={};wp.media.string={props:function(f,i){var h,c,e,g,d,j=wp.media.view.settings.defaultProps;d=function(k){if(&quot;image&quot;===k.type&amp;&amp;!k.alt){k.alt=k.caption||k.title||&quot;&quot;;k.alt=k.alt.replace(/&lt;\/?[^&gt;]+&gt;/g,&quot;&quot;);k.alt=k.alt.replace(/[\r\n]+/g,&quot; &quot;)}return k};f=f?_.clone(f):{};if(i&amp;&amp;i.type){f.type=i.type}if(&quot;image&quot;===f.type){f=_.defaults(f||{},{align:j.align||getUserSetting(&quot;align&quot;,&quot;none&quot;),size:j.size||getUserSetting(&quot;imgsize&quot;,&quot;medium&quot;),url:&quot;&quot;,classes:[]})}if(!i){return d(f)}f.title=f.title||i.title;h=f.link||j.link||getUserSetting(&quot;urlbutton&quot;,&quot;file&quot;);if(&quot;file&quot;===h){c=i.url}else{if(&quot;post&quot;===h){c=i.link}else{if(&quot;custom&quot;===h){c=f.linkUrl}}}f.linkUrl=c||&quot;&quot;;if(&quot;image&quot;===i.type){f.classes.push(&quot;wp-image-&quot;+i.id);g=i.sizes;e=g&amp;&amp;g[f.size]?g[f.size]:i;_.ex
 tend(f,_.pick(i,&quot;align&quot;,&quot;caption&quot;,&quot;alt&quot;),{width:e.width,height:e.height,src:e.url,captionId:&quot;attachment_&quot;+i.id})}else{if(&quot;video&quot;===i.type||&quot;audio&quot;===i.type){_.extend(f,_.pick(i,&quot;title&quot;,&quot;type&quot;,&quot;icon&quot;,&quot;mime&quot;))}else{f.title=f.title||i.filename;f.rel=f.rel||&quot;attachment wp-att-&quot;+i.id}}return d(f)},link:function(d,e){var c;d=wp.media.string.props(d,e);c={tag:&quot;a&quot;,content:d.title,attrs:{href:d.linkUrl}};if(d.rel){c.attrs.rel=d.rel}return wp.html.string(c)},audio:function(d,f){var e,c;d=wp.media.string.props(d,f);e={};if(d.mime){switch(d.mime){case&quot;audio/mpeg&quot;:if(f.url.indexOf(&quot;mp3&quot;)){e.mp3=f.url}else{if(f.url.indexOf(&quot;m4a&quot;)){e.m4a=f.url}}break;case&quot;audio/mp3&quot;:e.mp3=f.url;break;case&quot;audio/m4a&quot;:e.m4a=f.url;break;case&quot;audio/wav&quot;:e.wav=f.url;break;case&quot;audio/ogg&quot;:e.ogg=f.url;break;case&quot;audio/x-m
 s-wma&quot;:case&quot;audio/wma&quot;:e.wma=f.url;break}}c=wp.shortcode.string({tag:&quot;audio&quot;,attrs:e});return c},video:function(d,f){var e,c;d=wp.media.string.props(d,f);e={};if(f.width){e.width=f.width}if(f.height){e.height=f.height}if(d.mime){switch(d.mime){case&quot;video/mp4&quot;:e.mp4=f.url;break;case&quot;video/m4v&quot;:e.m4v=f.url;break;case&quot;video/webm&quot;:e.webm=f.url;break;case&quot;video/ogg&quot;:e.ogv=f.url;break;case&quot;video/x-ms-wmv&quot;:case&quot;video/wmv&quot;:case&quot;video/asf&quot;:e.wmv=f.url;break;case&quot;video/flv&quot;:case&quot;video/x-flv&quot;:e.flv=f.url;break}}c=wp.shortcode.string({tag:&quot;video&quot;,attrs:e});return c},image:function(g,i){var c={},d,f,h,e;g=wp.media.string.props(g,i);f=g.classes||[];c.src=g.url;_.extend(c,_.pick(g,&quot;width&quot;,&quot;height&quot;,&quot;alt&quot;));if(g.align&amp;&amp;!g.caption){f.push(&quot;align&quot;+g.align)}if(g.size){f.push(&quot;size-&quot;+g.size)}c[&quot;class&quot;]=_.c
 ompact(f).join(&quot; &quot;);d={tag:&quot;img&quot;,attrs:c,single:true};if(g.linkUrl){d={tag:&quot;a&quot;,attrs:{href:g.linkUrl},content:d}}e=wp.html.string(d);if(g.caption){h={};if(c.width){h.width=c.width}if(g.captionId){h.id=g.captionId}if(g.align){h.align=&quot;align&quot;+g.align}e=wp.shortcode.string({tag:&quot;caption&quot;,attrs:h,content:e+&quot; &quot;+g.caption})}return e}};wp.media.gallery=(function(){var c={};return{defaults:{order:&quot;ASC&quot;,id:wp.media.view.settings.post.id,itemtag:&quot;dl&quot;,icontag:&quot;dt&quot;,captiontag:&quot;dd&quot;,columns:&quot;3&quot;,size:&quot;thumbnail&quot;,orderby:&quot;menu_order ID&quot;},attachments:function(h){var j=h.string(),d=c[j],f,e,i,g;delete c[j];if(d){return d}f=_.defaults(h.attrs.named,wp.media.gallery.defaults);e=_.pick(f,&quot;orderby&quot;,&quot;order&quot;);e.type=&quot;image&quot;;e.perPage=-1;if(&quot;rand&quot;===f.orderby){f._orderbyRandom=true}if(!f.orderby||/^menu_order(?: ID)?$/i.test(f.order
 by)){e.orderby=&quot;menuOrder&quot;}if(f.ids){e.post__in=f.ids.split(&quot;,&quot;);e.orderby=&quot;post__in&quot;}else{if(f.include){e.post__in=f.include.split(&quot;,&quot;)}}if(f.exclude){e.post__not_in=f.exclude.split(&quot;,&quot;)}if(!e.post__in){e.uploadedTo=f.id}g=_.omit(f,&quot;id&quot;,&quot;ids&quot;,&quot;include&quot;,&quot;exclude&quot;,&quot;orderby&quot;,&quot;order&quot;);i=wp.media.query(e);i.gallery=new Backbone.Model(g);return i},shortcode:function(d){var f=d.props.toJSON(),e=_.pick(f,&quot;orderby&quot;,&quot;order&quot;),g,h;if(d.gallery){_.extend(e,d.gallery.toJSON())}e.ids=d.pluck(&quot;id&quot;);if(f.uploadedTo){e.id=f.uploadedTo}if(e._orderbyRandom){e.orderby=&quot;rand&quot;}delete e._orderbyRandom;if(e.ids&amp;&amp;&quot;post__in&quot;===e.orderby){delete e.orderby}_.each(wp.media.gallery.defaults,function(j,i){if(j===e[i]){delete e[i]}});g=new wp.shortcode({tag:&quot;gallery&quot;,attrs:e,type:&quot;single&quot;});h=new wp.media.model.Attachment
 s(d.models,{props:f});h.gallery=d.gallery;c[g.string()]=h;return g},edit:function(g){var f=wp.shortcode.next(&quot;gallery&quot;,g),h=wp.media.gallery.defaults.id,d,e;if(!f||f.content!==g){return}f=f.shortcode;if(_.isUndefined(f.get(&quot;id&quot;))&amp;&amp;!_.isUndefined(h)){f.set(&quot;id&quot;,h)}d=wp.media.gallery.attachments(f);e=new wp.media.model.Selection(d.models,{props:d.props.toJSON(),multiple:true});e.gallery=d.gallery;e.more().done(function(){e.props.set({query:false});e.unmirror();e.props.unset(&quot;orderby&quot;)});if(this.frame){this.frame.dispose()}this.frame=wp.media({frame:&quot;post&quot;,state:&quot;gallery-edit&quot;,title:wp.media.view.l10n.editGalleryTitle,editing:true,multiple:true,selection:e}).open();return this.frame}}}());wp.media.featuredImage={get:function(){return wp.media.view.settings.post.featuredImageId},set:function(d){var c=wp.media.view.settings;c.post.featuredImageId=d;wp.media.post(&quot;set-post-thumbnail&quot;,{json:true,post_id:c
 .post.id,thumbnail_id:c.post.featuredImageId,_wpnonce:c.post.nonce}).done(function(e){b(&quot;.inside&quot;,&quot;#postimagediv&quot;).html(e)})},frame:function(){if(this._frame){return this._frame}this._frame=wp.media({state:&quot;featured-image&quot;,states:[new wp.media.controller.FeaturedImage()]});this._frame.on(&quot;toolbar:create:featured-image&quot;,function(c){this.createSelectToolbar(c,{text:wp.media.view.l10n.setFeaturedImage})},this._frame);this._frame.state(&quot;featured-image&quot;).on(&quot;select&quot;,this.select);return this._frame},select:function(){var d=wp.media.view.settings,c=this.get(&quot;selection&quot;).single();if(!d.post.featuredImageId){return}wp.media.featuredImage.set(c?c.id:-1)},init:function(){b(&quot;#postimagediv&quot;).on(&quot;click&quot;,&quot;#set-post-thumbnail&quot;,function(c){c.preventDefault();c.stopPropagation();wp.media.featuredImage.frame().open()}).on(&quot;click&quot;,&quot;#remove-post-thumbnail&quot;,function(){wp.media.v
 iew.settings.post.featuredImageId=-1})}};b(wp.media.featuredImage.init);wp.media.editor={insert:function(g){var d=typeof(tinymce)!=&quot;undefined&quot;,j=typeof(QTags)!=&quot;undefined&quot;,c=window.wpActiveEditor,f;if(window.send_to_editor){return window.send_to_editor.apply(this,arguments)}if(!c){if(d&amp;&amp;tinymce.activeEditor){f=tinymce.activeEditor;c=window.wpActiveEditor=f.id}else{if(!j){return false}}}else{if(d){if(tinymce.activeEditor&amp;&amp;(tinymce.activeEditor.id==&quot;mce_fullscreen&quot;||tinymce.activeEditor.id==&quot;wp_mce_fullscreen&quot;)){f=tinymce.activeEditor}else{f=tinymce.get(c)}}}if(f&amp;&amp;!f.isHidden()){if(tinymce.isIE&amp;&amp;f.windowManager.insertimagebookmark){f.selection.moveToBookmark(f.windowManager.insertimagebookmark)}if(g.indexOf(&quot;[caption&quot;)!==-1){if(f.wpSetImgCaption){g=f.wpSetImgCaption(g)}}else{if(g.indexOf(&quot;[gallery&quot;)!==-1){if(f.plugins.wpgallery){g=f.plugins.wpgallery._do_gallery(g)}}else{if(g.indexOf(&q
 uot;[embed&quot;)===0){if(f.plugins.wordpress){g=f.plugins.wordpress._setEmbed(g)}}}}f.execCommand(&quot;mceInsertContent&quot;,false,g)}else{if(j){QTags.insertContent(g)}else{document.getElementById(c).value+=g}}if(window.tb_remove){try{window.tb_remove()}catch(i){}}},add:function(e,c){var d=this.get(e);if(d){return d}d=a[e]=wp.media(_.defaults(c||{},{frame:&quot;post&quot;,state:&quot;insert&quot;,title:wp.media.view.l10n.addMedia,multiple:true}));d.on(&quot;insert&quot;,function(f){var g=d.state();f=f||g.get(&quot;selection&quot;);if(!f){return}b.when.apply(b,f.map(function(i){var h=g.display(i).toJSON();return this.send.attachment(h,i.toJSON())},this)).done(function(){wp.media.editor.insert(_.toArray(arguments).join(&quot;\n\n&quot;))})},this);d.state(&quot;gallery-edit&quot;).on(&quot;update&quot;,function(f){this.insert(wp.media.gallery.shortcode(f).string())},this);d.state(&quot;embed&quot;).on(&quot;select&quot;,function(){var g=d.state(),f=g.get(&quot;type&quot;),h=
 g.props.toJSON();h.url=h.url||&quot;&quot;;if(&quot;link&quot;===f){_.defaults(h,{title:h.url,linkUrl:h.url});this.send.link(h).done(function(i){wp.media.editor.insert(i)})}else{if(&quot;image&quot;===f){_.defaults(h,{title:h.url,linkUrl:&quot;&quot;,align:&quot;none&quot;,link:&quot;none&quot;});if(&quot;none&quot;===h.link){h.linkUrl=&quot;&quot;}else{if(&quot;file&quot;===h.link){h.linkUrl=h.url}}this.insert(wp.media.string.image(h))}}},this);d.state(&quot;featured-image&quot;).on(&quot;select&quot;,wp.media.featuredImage.select);d.setState(d.options.state);return d},id:function(c){if(c){return c}c=wpActiveEditor;if(!c&amp;&amp;typeof tinymce!==&quot;undefined&quot;&amp;&amp;tinymce.activeEditor){c=tinymce.activeEditor.id}c=c||&quot;&quot;;return c},get:function(c){c=this.id(c);return a[c]},remove:function(c){c=this.id(c);delete a[c]},send:{attachment:function(f,g){var c=g.caption,d,e;if(!wp.media.view.settings.captions){delete g.caption}f=wp.media.string.props(f,g);d={id
 :g.id,post_content:g.description,post_excerpt:c};if(f.linkUrl){d.url=f.linkUrl}if(&quot;image&quot;===g.type){e=wp.media.string.image(f);_.each({align:&quot;align&quot;,size:&quot;image-size&quot;,alt:&quot;image_alt&quot;},function(h,i){if(f[i]){d[h]=f[i]}})}else{if(&quot;video&quot;===g.type){e=wp.media.string.video(f,g)}else{if(&quot;audio&quot;===g.type){e=wp.media.string.audio(f,g)}else{e=wp.media.string.link(f);d.post_title=f.title}}}return wp.media.post(&quot;send-attachment-to-editor&quot;,{nonce:wp.media.view.settings.nonce.sendToEditor,attachment:d,html:e,post_id:wp.media.view.settings.post.id})},link:function(c){return wp.media.post(&quot;send-link-to-editor&quot;,{nonce:wp.media.view.settings.nonce.sendToEditor,src:c.linkUrl,title:c.title,html:wp.media.string.link(c),post_id:wp.media.view.settings.post.id})}},open:function(e){var d,c;e=this.id(e);if(typeof tinymce!==&quot;undefined&quot;){c=tinymce.get(e);if(tinymce.isIE&amp;&amp;c&amp;&amp;!c.isHidden()){c.focus
 ();c.windowManager.insertimagebookmark=c.selection.getBookmark()}}d=this.get(e);if(!d){d=this.add(e)}return d.open()},init:function(){b(document.body).on(&quot;click&quot;,&quot;.insert-media&quot;,function(d){var e=b(this),c=e.data(&quot;editor&quot;);d.preventDefault();e.blur();wp.media.editor.open(c)})}};_.bindAll(wp.media.editor,&quot;open&quot;);b(wp.media.editor.init)}(jQuery));
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpincludesversionphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/version.php (23969 => 23970)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/version.php        2013-04-11 22:34:05 UTC (rev 23969)
+++ trunk/wp-includes/version.php        2013-04-11 22:58:39 UTC (rev 23970)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx">  *
</span><span class="cx">  * @global string $wp_version
</span><span class="cx">  */
</span><del>-$wp_version = '3.6-beta1-23960';
</del><ins>+$wp_version = '3.6-beta1-23970';
</ins><span class="cx"> 
</span><span class="cx"> /**
</span><span class="cx">  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
</span></span></pre>
</div>
</div>

</body>
</html>