<!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>[18570] trunk: Fix Press This editors, see #17144</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/18570">18570</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2011-08-19 01:14:56 +0000 (Fri, 19 Aug 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix Press This editors, see <a href="http://core.trac.wordpress.org/ticket/17144">#17144</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadmincsspressthiscss">trunk/wp-admin/css/press-this.css</a></li>
<li><a href="#trunkwpadmincsspressthisdevcss">trunk/wp-admin/css/press-this.dev.css</a></li>
<li><a href="#trunkwpadmineditformadvancedphp">trunk/wp-admin/edit-form-advanced.php</a></li>
<li><a href="#trunkwpadminpressthisphp">trunk/wp-admin/press-this.php</a></li>
<li><a href="#trunkwpincludesclasswpeditorphp">trunk/wp-includes/class-wp-editor.php</a></li>
<li><a href="#trunkwpincludesscriptloaderphp">trunk/wp-includes/script-loader.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadmincsspressthiscss"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/css/press-this.css (18569 => 18570)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/css/press-this.css 2011-08-18 22:40:37 UTC (rev 18569)
+++ trunk/wp-admin/css/press-this.css 2011-08-19 01:14:56 UTC (rev 18570)
</span><span class="lines">@@ -1 +1 @@
</span><del>-body{font-size:13px;font-family:sans-serif;color:#333;margin:0;padding:0;min-width:675px;min-height:400px;}img{border:none;}#wphead{height:32px;margin-right:5px;margin-bottom:5px;}#header-logo{float:left;margin:7px 7px 0;-webkit-user-select:none;-moz-user-select:none;-khtml-user-select:none;user-select:none;}#wphead h1{font:normal 16px Georgia,"Times New Roman","Bitstream Charter",Times,serif;padding:6px 0 0;margin:0;float:left;}#wphead h1 a{text-decoration:none;}#wphead h1 a:hover{text-decoration:underline;}.tagchecklist span a{background:transparent url(../images/xit.gif) no-repeat 0 0;}#edButtonPreview,#edButtonHTML{height:18px;margin:5px 5px 0 0;padding:4px 5px 2px;float:right;cursor:pointer;border-width:1px;border-style:solid;-moz-border-radius:3px 3px 0 0;-webkit-border-top-right-radius:3px;-webkit-border-top-left-radius:3px;-khtml-border-top-right-radius:3px;-khtml-border-top-left-radius:3px;border-top-right-radius:3px;border-top-left-r
adius:3px;}#poststuff #edButtonHTML{margin-right:15px;}#media-buttons{cursor:default;padding:8px 8px 0;}#media-buttons a{cursor:pointer;padding:0 0 5px 10px;}#media-buttons img,#submitpost #ajax-loading,#submitpost .ajax-loading{vertical-align:middle;}.howto{margin-top:2px;margin-bottom:3px;font-size:12px;font-style:italic;display:block;}input.text{outline-color:-moz-use-text-color;outline-style:none;outline-width:medium;width:100%;}#message{-moz-border-radius:3px;-khtml-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;}div#poststuff{margin:0 10px 10px;}#poststuff #editor-toolbar{height:30px;}div.zerosize{border:0 none;height:0;margin:0;overflow:hidden;padding:0;width:0;}.posting{margin-right:212px;position:relative;}#side-info-column{float:right;width:200px;position:relative;right:0;}#side-info-column .sleeve{padding-top:5px;}#poststuff .inside{font-size:12px;margin:8px;}#submitdiv .inside{margin:0;}#submitdiv .inside p{padding:5px 8px;margin:0;}#submitdiv #pub
lishing-actions{padding-left:6px;border-bottom:1px solid #dfdfdf;-webkit-box-shadow:0 1px 0 #fff;-moz-box-shadow:0 1px 0 #fff;box-shadow:0 1px 0 #fff;}#publish{float:right;}#poststuff h2,#poststuff h3{font-size:13px;font-family:Georgia,"Times New Roman","Bitstream Charter",Times,serif;font-weight:normal;line-height:1;margin:0;padding:7px 9px;border-width:0 0 1px 0;border-style:solid;}#poststuff h2{border-color:#dfdfdf;}#tagsdiv-post_tag h3,#categorydiv h3{cursor:pointer;}h3.tb{text-shadow:0 1px 0 #fff;font-weight:bold;font-size:12px;margin-left:5px;}#TB_window{border:1px solid #333;-moz-border-radius:3px;-khtml-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;}.postbox,.stuffbox{margin-bottom:10px;border-width:1px;border-style:solid;line-height:1;-moz-border-radius:3px;-khtml-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;}.postbox:hover .handlediv,.stuffbox:hover .handlediv{background:transparent url(../images/arrows.png) no-r
epeat 6px 7px;}.postbox .handlediv{float:right;width:27px;height:30px;cursor:pointer;}#title,.tbtitle{font-family:sans-serif;-moz-border-radius:3px;-khtml-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;border-style:solid;border-width:1px;font-size:1.7em;outline:none;padding:3px 4px;border-color:#dfdfdf;}.tbtitle{font-size:12px;padding:3px;}#title{width:97%;}.editor-container{-moz-border-radius:3px;-khtml-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;border:1px solid #ccc;background-color:#fff;}.actions{float:right;margin:-19px 0 0;}#extra-fields .actions{margin:-23px -7px 0 0;}.actions li{float:left;list-style:none;margin-right:10px;}#extra-fields .button{margin-right:5px;padding:3px 6px;border-radius:10px;-webkit-border-radius:10px;-khtml-border-radius:10px;-moz-border-radius:10px;}#photo_saving{margin:0 8px 8px;vertical-align:middle;}#img_container_container{overflow:auto;}#extra-fields{margin-top:10px;position:relative;}#waiting{margin-top:1
0px;}#extra-fields .postbox{margin-bottom:5px;}#extra-fields .titlewrap{padding:0;overflow:auto;height:100px;}#img_container a{display:block;float:left;overflow:hidden;vertical-align:center;}#img_container img,#img_container a{width:68px;height:68px;}#img_container img{border:none;background-color:#f4f4f4;cursor:pointer;}#img_container a,#img_container a:link,#img_container a:visited{border:1px solid #ccc;display:block;position:relative;}#img_container a:hover,#img_container a:active{border-color:#000;z-index:1000;border-width:2px;margin:-1px;}#embed-code{width:100%;height:98px;}.wp-hidden-children .wp-hidden-child{display:none;}.category-add input{width:94%;font-family:sans-serif;font-size:12px;margin:1px;}select{width:100%;-x-system-font:none;border-style:solid;border-width:1px;font-family:sans-serif;font-size:12px;height:2em;line-height:20px;padding:2px;margin:1px;vertical-align:top;}.category-add input.category-add-sumbit{width:auto;}.categorydiv div.tabs-panel,#linkcate
gorydiv div.tabs-panel{height:100px;overflow:auto;padding:.5em .9em;border-style:solid;border-width:1px;}.category-tabs li{display:inline;padding-right:8px;}.category-tabs a{text-decoration:none;}.categorydiv ul,#linkcategorydiv ul{list-style:none;padding:0;margin:0;}.inline-editor ul.cat-checklist ul,.categorydiv ul.categorychecklist ul,#linkcategorydiv ul.categorychecklist ul{margin-left:18px;}ul.categorychecklist li{margin:0;padding:0;line-height:19px;}.categorydiv .tabs-panel{border-width:3px;border-style:solid;}ul.category-tabs{margin-top:12px;margin-bottom:5px;}ul.category-tabs li.tabs{border-style:solid solid none;border-width:1px 1px 0;}ul.category-tabs li{padding:5px 8px;-moz-border-radius:3px 3px 0 0;-webkit-border-top-left-radius:3px;-webkit-border-top-right-radius:3px;-khtml-border-top-left-radius:3px;-khtml-border-top-right-radius:3px;border-top-left-radius:3px;border-top-right-radius:3px;}.screen-reader-text{display:none;}.tagsdiv .newtag{margin-right:5px;}.jax
tag{clear:both;margin:0;}.tagadd{margin-left:3px;}.tagchecklist{margin-top:3px;margin-bottom:1em;font-size:12px;overflow:auto;}.tagchecklist strong{position:absolute;font-size:.75em;}.tagchecklist span{margin-right:.5em;margin-left:10px;display:block;float:left;font-size:12px;line-height:1.8em;white-space:nowrap;cursor:default;}.tagchecklist span a{margin:6px 0 0 -9px;cursor:pointer;width:10px;height:10px;display:block;float:left;text-indent:-9999px;overflow:hidden;position:absolute;}#content{margin:5px 0;padding:0 5px;border:0 none;height:365px;width:97%!important;font-family:Consolas,Monaco,monospace;font-size:13px;line-height:19px;background:transparent;}* html .postdivrich{zoom:1;}#saving{display:inline;vertical-align:middle;}.submit input,.button,.button-primary,.button-secondary,.button-highlighted,#postcustomstuff .submit input{font-family:sans-serif;text-decoration:none;font-size:12px!important;line-height:16px;padding:2px 8px;margin:2px;cursor:pointer;border-width:1
px;border-style:solid;-moz-border-radius:11px;-khtml-border-radius:11px;-webkit-border-radius:11px;border-radius:11px;}.button-primary{background:#21759B url(../images/button-grad.png) repeat-x scroll left top;border-color:#21759B;color:#fff;}.ac_results{padding:0;margin:0;list-style:none;position:absolute;z-index:10000;display:none;border-width:1px;border-style:solid;}.ac_results li{padding:2px 5px;white-space:nowrap;text-align:left;}.ac_over{cursor:pointer;}.ac_match{text-decoration:underline;}#TB_ajaxContent #options{position:absolute;top:20px;right:25px;padding:5px;}#TB_ajaxContent h3{margin-bottom:.25em;}.updated{margin:10px 0;padding:0;border-width:1px;border-style:solid;width:99%;}.updated p,.error p{margin:.6em 0;padding:0 .6em;}.error a{text-decoration:underline;}.updated a{text-decoration:none;padding-bottom:2px;}#post_status{margin-left:10px;margin-bottom:1em;display:block;}#footer{height:65px;display:block;width:640px;padding:10px 0 0 60px;margin:0;position:absol
ute;bottom:0;font-size:12px;}#footer p{margin:0;padding:7px 0;}#footer p a{text-decoration:none;}#footer p a:hover{text-decoration:underline;}.centered{text-align:center;}.hidden{display:none;}.postbox input[type="text"],.postbox textarea,.stuffbox input[type="text"],.stuffbox textarea{border-width:1px;border-style:solid;}.taghint{color:#aaa;margin:-17px 0 0 7px;visibility:hidden;}input.newtag ~ div.taghint{visibility:visible;}input.newtag:focus ~ div.taghint{visibility:hidden;}#mce_fullscreen_container{background:#fff;}
</del><span class="cx">\ No newline at end of file
</span><ins>+body{font-size:13px;font-family:sans-serif;color:#333;margin:0;padding:0;min-width:675px;min-height:400px;}img{border:none;}#wphead{height:32px;margin-right:5px;margin-bottom:5px;}#header-logo{float:left;margin:7px 7px 0;-webkit-user-select:none;-moz-user-select:none;-khtml-user-select:none;user-select:none;}#wphead h1{font:normal 16px Georgia,"Times New Roman","Bitstream Charter",Times,serif;padding:6px 0 0;margin:0;float:left;}#wphead h1 a{text-decoration:none;}#wphead h1 a:hover{text-decoration:underline;}.tagchecklist span a{background:transparent url(../images/xit.gif) no-repeat 0 0;}#edButtonPreview,#edButtonHTML{height:18px;margin:5px 5px 0 0;padding:4px 5px 2px;float:right;cursor:pointer;border-width:1px;border-style:solid;-moz-border-radius:3px 3px 0 0;-webkit-border-top-right-radius:3px;-webkit-border-top-left-radius:3px;-khtml-border-top-right-radius:3px;-khtml-border-top-left-radius:3px;border-top-right-radius:3px;border-top-left-r
adius:3px;}#poststuff #edButtonHTML{margin-right:15px;}#media-buttons{cursor:default;padding:8px 8px 0;}#media-buttons a{cursor:pointer;padding:0 0 5px 10px;}#media-buttons img,#submitpost #ajax-loading,#submitpost .ajax-loading{vertical-align:middle;}.howto{margin-top:2px;margin-bottom:3px;font-size:12px;font-style:italic;display:block;}input.text{outline-color:-moz-use-text-color;outline-style:none;outline-width:medium;width:100%;}#message{-moz-border-radius:3px;-khtml-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;}div#poststuff{margin:0 10px 10px;}#poststuff #editor-toolbar{height:30px;}div.zerosize{border:0 none;height:0;margin:0;overflow:hidden;padding:0;width:0;}.posting{margin-right:212px;position:relative;}#side-info-column{float:right;width:200px;position:relative;right:0;}#side-info-column .sleeve{padding-top:5px;}#poststuff .inside{font-size:12px;margin:8px;}#submitdiv .inside{margin:0;}#submitdiv .inside p{padding:5px 8px;margin:0;}#submitdiv #pub
lishing-actions{padding-left:6px;border-bottom:1px solid #dfdfdf;-webkit-box-shadow:0 1px 0 #fff;-moz-box-shadow:0 1px 0 #fff;box-shadow:0 1px 0 #fff;}#publish{float:right;}#poststuff h2,#poststuff h3{font-size:13px;font-family:Georgia,"Times New Roman","Bitstream Charter",Times,serif;font-weight:normal;line-height:1;margin:0;padding:7px 9px;border-width:0 0 1px 0;border-style:solid;}#poststuff h2{border-color:#dfdfdf;}#tagsdiv-post_tag h3,#categorydiv h3{cursor:pointer;}h3.tb{text-shadow:0 1px 0 #fff;font-weight:bold;font-size:12px;margin-left:5px;}#TB_window{border:1px solid #333;-moz-border-radius:3px;-khtml-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;}.postbox,.stuffbox{margin-bottom:10px;border-width:1px;border-style:solid;line-height:1;-moz-border-radius:3px;-khtml-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;}.postbox:hover .handlediv,.stuffbox:hover .handlediv{background:transparent url(../images/arrows.png) no-r
epeat 6px 7px;}.postbox .handlediv{float:right;width:27px;height:30px;cursor:pointer;}#title,.tbtitle{font-family:sans-serif;-moz-border-radius:3px;-khtml-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;border-style:solid;border-width:1px;font-size:1.7em;outline:none;padding:3px 4px;border-color:#dfdfdf;}.tbtitle{font-size:12px;padding:3px;}#title{width:97%;}.editor-container{-moz-border-radius:3px;-khtml-border-radius:3px;-webkit-border-radius:3px;border-radius:3px;border:1px solid #ccc;background-color:#fff;}.actions{float:right;margin:-19px 0 0;}#extra-fields .actions{margin:-23px -7px 0 0;}.actions li{float:left;list-style:none;margin-right:10px;}#extra-fields .button{margin-right:5px;padding:3px 6px;border-radius:10px;-webkit-border-radius:10px;-khtml-border-radius:10px;-moz-border-radius:10px;}#photo_saving{margin:0 8px 8px;vertical-align:middle;}#img_container_container{overflow:auto;}#extra-fields{margin-top:10px;position:relative;}#waiting{margin-top:1
0px;}#extra-fields .postbox{margin-bottom:5px;}#extra-fields .titlewrap{padding:0;overflow:auto;height:100px;}#img_container a{display:block;float:left;overflow:hidden;vertical-align:center;}#img_container img,#img_container a{width:68px;height:68px;}#img_container img{border:none;background-color:#f4f4f4;cursor:pointer;}#img_container a,#img_container a:link,#img_container a:visited{border:1px solid #ccc;display:block;position:relative;}#img_container a:hover,#img_container a:active{border-color:#000;z-index:1000;border-width:2px;margin:-1px;}#embed-code{width:100%;height:98px;}.wp-hidden-children .wp-hidden-child{display:none;}.category-add input{width:94%;font-family:sans-serif;font-size:12px;margin:1px;}select{width:100%;-x-system-font:none;border-style:solid;border-width:1px;font-family:sans-serif;font-size:12px;height:2em;line-height:20px;padding:2px;margin:1px;vertical-align:top;}.category-add input.category-add-sumbit{width:auto;}.categorydiv div.tabs-panel,#linkcate
gorydiv div.tabs-panel{height:100px;overflow:auto;padding:.5em .9em;border-style:solid;border-width:1px;}.category-tabs li{display:inline;padding-right:8px;}.category-tabs a{text-decoration:none;}.categorydiv ul,#linkcategorydiv ul{list-style:none;padding:0;margin:0;}.inline-editor ul.cat-checklist ul,.categorydiv ul.categorychecklist ul,#linkcategorydiv ul.categorychecklist ul{margin-left:18px;}ul.categorychecklist li{margin:0;padding:0;line-height:19px;}.categorydiv .tabs-panel{border-width:3px;border-style:solid;}ul.category-tabs{margin-top:12px;margin-bottom:5px;}ul.category-tabs li.tabs{border-style:solid solid none;border-width:1px 1px 0;}ul.category-tabs li{padding:5px 8px;-moz-border-radius:3px 3px 0 0;-webkit-border-top-left-radius:3px;-webkit-border-top-right-radius:3px;-khtml-border-top-left-radius:3px;-khtml-border-top-right-radius:3px;border-top-left-radius:3px;border-top-right-radius:3px;}.screen-reader-text{display:none;}.tagsdiv .newtag{margin-right:5px;}.jax
tag{clear:both;margin:0;}.tagadd{margin-left:3px;}.tagchecklist{margin-top:3px;margin-bottom:1em;font-size:12px;overflow:auto;}.tagchecklist strong{position:absolute;font-size:.75em;}.tagchecklist span{margin-right:.5em;margin-left:10px;display:block;float:left;font-size:12px;line-height:1.8em;white-space:nowrap;cursor:default;}.tagchecklist span a{margin:6px 0 0 -9px;cursor:pointer;width:10px;height:10px;display:block;float:left;text-indent:-9999px;overflow:hidden;position:absolute;}#content{margin:5px 0;padding:0 5px;border:0 none;height:357px;font-family:Consolas,Monaco,monospace;font-size:13px;line-height:19px;background:transparent;}#saving{display:inline;vertical-align:middle;}.submit input,.button,.button-primary,.button-secondary,.button-highlighted,#postcustomstuff .submit input{font-family:sans-serif;text-decoration:none;font-size:12px!important;line-height:16px;padding:2px 8px;margin:2px;cursor:pointer;border-width:1px;border-style:solid;-moz-border-radius:11px;-k
html-border-radius:11px;-webkit-border-radius:11px;border-radius:11px;}.button-primary{background:#21759B url(../images/button-grad.png) repeat-x scroll left top;border-color:#21759B;color:#fff;}.ac_results{padding:0;margin:0;list-style:none;position:absolute;z-index:10000;display:none;border-width:1px;border-style:solid;}.ac_results li{padding:2px 5px;white-space:nowrap;text-align:left;}.ac_over{cursor:pointer;}.ac_match{text-decoration:underline;}#TB_ajaxContent #options{position:absolute;top:20px;right:25px;padding:5px;}#TB_ajaxContent h3{margin-bottom:.25em;}.updated{margin:10px 0;padding:0;border-width:1px;border-style:solid;width:99%;}.updated p,.error p{margin:.6em 0;padding:0 .6em;}.error a{text-decoration:underline;}.updated a{text-decoration:none;padding-bottom:2px;}#post_status{margin-left:10px;margin-bottom:1em;display:block;}#footer{height:65px;display:block;width:640px;padding:10px 0 0 60px;margin:0;position:absolute;bottom:0;font-size:12px;}#footer p{margin:0;
padding:7px 0;}#footer p a{text-decoration:none;}#footer p a:hover{text-decoration:underline;}.centered{text-align:center;}.hidden{display:none;}.postbox input[type="text"],.postbox textarea,.stuffbox input[type="text"],.stuffbox textarea{border-width:1px;border-style:solid;}.taghint{color:#aaa;margin:-17px 0 0 7px;visibility:hidden;}input.newtag ~ div.taghint{visibility:visible;}input.newtag:focus ~ div.taghint{visibility:hidden;}#mce_fullscreen_container{background:#fff;}#photo-add-url-div input[type="text"]{width:300px;}
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkwpadmincsspressthisdevcss"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/css/press-this.dev.css (18569 => 18570)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/css/press-this.dev.css 2011-08-18 22:40:37 UTC (rev 18569)
+++ trunk/wp-admin/css/press-this.dev.css 2011-08-19 01:14:56 UTC (rev 18570)
</span><span class="lines">@@ -505,18 +505,13 @@
</span><span class="cx"> margin: 5px 0;
</span><span class="cx"> padding: 0 5px;
</span><span class="cx"> border: 0 none;
</span><del>- height: 365px;
- width: 97% !important;
</del><ins>+ height: 357px;
</ins><span class="cx"> font-family: Consolas, Monaco, monospace;
</span><span class="cx"> font-size: 13px;
</span><span class="cx"> line-height: 19px;
</span><span class="cx"> background: transparent;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-* html .postdivrich {
- zoom: 1;
-}
-
</del><span class="cx"> /* Submit */
</span><span class="cx"> #saving {
</span><span class="cx"> display: inline;
</span><span class="lines">@@ -676,3 +671,8 @@
</span><span class="cx"> #mce_fullscreen_container {
</span><span class="cx"> background: #fff;
</span><span class="cx"> }
</span><ins>+
+#photo-add-url-div input[type="text"] {
+ width: 300px;
+}
+
</ins></span></pre></div>
<a id="trunkwpadmineditformadvancedphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit-form-advanced.php (18569 => 18570)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit-form-advanced.php 2011-08-18 22:40:37 UTC (rev 18569)
+++ trunk/wp-admin/edit-form-advanced.php 2011-08-19 01:14:56 UTC (rev 18570)
</span><span class="lines">@@ -266,7 +266,7 @@
</span><span class="cx"> <?php if ( post_type_supports($post_type, 'editor') ) { ?>
</span><span class="cx"> <div id="postdivrich" class="postarea">
</span><span class="cx">
</span><del>-<?php wp_editor($post->post_content, 'content'); ?>
</del><ins>+<?php wp_editor($post->post_content, 'content', array('dfw' => true) ); ?>
</ins><span class="cx">
</span><span class="cx"> <table id="post-status-info" cellspacing="0"><tbody><tr>
</span><span class="cx"> <td id="wp-word-count"><?php printf( __( 'Word count: %s' ), '<span class="word-count">0</span>' ); ?></td>
</span></span></pre></div>
<a id="trunkwpadminpressthisphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/press-this.php (18569 => 18570)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/press-this.php 2011-08-18 22:40:37 UTC (rev 18569)
+++ trunk/wp-admin/press-this.php 2011-08-19 01:14:56 UTC (rev 18570)
</span><span class="lines">@@ -26,21 +26,14 @@
</span><span class="cx"> * @return int Post ID
</span><span class="cx"> */
</span><span class="cx"> function press_it() {
</span><del>- // define some basic variables
- $quick = array();
- $quick['post_status'] = 'draft'; // set as draft first
- $quick['post_category'] = isset($_POST['post_category']) ? $_POST['post_category'] : null;
- $quick['tax_input'] = isset($_POST['tax_input']) ? $_POST['tax_input'] : null;
- $quick['post_title'] = ( trim($_POST['title']) != '' ) ? $_POST['title'] : ' ';
- $quick['post_content'] = isset($_POST['post_content']) ? $_POST['post_content'] : '';
</del><span class="cx">
</span><del>- // insert the post with nothing in it, to get an ID
- $post_ID = wp_insert_post($quick, true);
- if ( is_wp_error($post_ID) )
- wp_die($post_ID);
</del><ins>+ $post = get_default_post_to_edit('post', true);
+ $post_ID = $post['ID'];
+ $post['post_category'] = isset($_POST['post_category']) ? $_POST['post_category'] : null;
+ $post['tax_input'] = isset($_POST['tax_input']) ? $_POST['tax_input'] : null;
+ $post['post_title'] = isset($_POST['title']) ? $_POST['title'] : '';
+ $post['post_content'] = isset($_POST['post_content']) ? $_POST['post_content'] : '';
</ins><span class="cx">
</span><del>- $content = isset($_POST['content']) ? $_POST['content'] : '';
-
</del><span class="cx"> $upload = false;
</span><span class="cx"> if ( !empty($_POST['photo_src']) && current_user_can('upload_files') ) {
</span><span class="cx"> foreach( (array) $_POST['photo_src'] as $key => $image) {
</span><span class="lines">@@ -57,12 +50,12 @@
</span><span class="cx"> }
</span><span class="cx"> // set the post_content and status
</span><span class="cx"> if ( isset( $_POST['publish'] ) && current_user_can( 'publish_posts' ) )
</span><del>- $quick['post_status'] = 'publish';
</del><ins>+ $post['post_status'] = 'publish';
</ins><span class="cx"> elseif ( isset( $_POST['review'] ) )
</span><del>- $quick['post_status'] = 'pending';
</del><ins>+ $post['post_status'] = 'pending';
</ins><span class="cx"> else
</span><del>- $quick['post_status'] = 'draft';
- $quick['post_content'] = $content;
</del><ins>+ $post['post_status'] = 'draft';
+
</ins><span class="cx"> // error handling for media_sideload
</span><span class="cx"> if ( is_wp_error($upload) ) {
</span><span class="cx"> wp_delete_post($post_ID);
</span><span class="lines">@@ -80,17 +73,16 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $quick['ID'] = $post_ID;
- wp_update_post($quick);
</del><ins>+ wp_update_post($post);
</ins><span class="cx"> }
</span><ins>+
</ins><span class="cx"> return $post_ID;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // For submitted posts.
</span><span class="cx"> if ( isset($_REQUEST['action']) && 'post' == $_REQUEST['action'] ) {
</span><span class="cx"> check_admin_referer('press-this');
</span><del>- $post_ID = press_it();
- $posted = $post_ID;
</del><ins>+ $posted = $post_ID = press_it();
</ins><span class="cx"> } else {
</span><span class="cx"> $post_ID = 0;
</span><span class="cx"> }
</span><span class="lines">@@ -164,34 +156,6 @@
</span><span class="cx">
</span><span class="cx"> <p id="options"><a href="#" class="select button"><?php _e('Insert Image'); ?></a> <a href="#" class="cancel button"><?php _e('Cancel'); ?></a></p>
</span><span class="cx"> <?php break;
</span><del>-
- case 'photo_thickbox_url': ?>
- <script type="text/javascript" charset="utf-8">
- /* <![CDATA[ */
- jQuery('.cancel').click(function() {
- tb_remove();
- });
-
- jQuery('.select').click(function() {
- image_selector();
- });
- /* ]]> */
- </script>
- <h3 class="tb"><label for="this_photo"><?php _e('URL') ?></label></h3>
- <div class="titlediv">
- <div class="titlewrap">
- <input id="this_photo" name="this_photo" class="tbtitle text" onkeypress="if(event.keyCode==13) image_selector();" />
- </div>
- </div>
- <h3 class="tb"><label for="photo_description"><?php _e('Description') ?></label></h3>
- <div id="titlediv">
- <div class="titlewrap">
- <input id="this_photo_description" name="photo_description" class="tbtitle text" onkeypress="if(event.keyCode==13) image_selector();" value="<?php echo esc_attr($title);?>"/>
- </div>
- </div>
-
- <p id="options"><a href="#" class="select"><?php _e('Insert Image'); ?></a> | <a href="#" class="cancel"><?php _e('Cancel'); ?></a></p>
- <?php break;
</del><span class="cx"> case 'photo_images':
</span><span class="cx"> /**
</span><span class="cx"> * Retrieve all image URLs from given URI.
</span><span class="lines">@@ -312,7 +276,7 @@
</span><span class="cx"> jQuery('#extra-fields').html('');
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><del>- jQuery('#extra-fields').html('<div class="postbox"><h2><?php _e( 'Add Photos' ); ?> <small id="photo_directions">(<?php _e("click images to select") ?>)</small></h2><ul class="actions"><li><a href="#" id="photo-add-url" class="thickbox button"><?php _e("Add from URL") ?> +</a></li></ul><div class="inside"><div class="titlewrap"><div id="img_container"></div></div><p id="options"><a href="#" class="close button"><?php _e('Cancel'); ?></a><a href="#" class="refresh button"><?php _e('Refresh'); ?></a></p></div>');
</del><ins>+ jQuery('#extra-fields').html('<div class="postbox"><h2><?php _e( 'Add Photos' ); ?> <small id="photo_directions">(<?php _e("click images to select") ?>)</small></h2><ul class="actions"><li><a href="#" id="photo-add-url" class="button"><?php _e("Add from URL") ?> +</a></li></ul><div class="inside"><div class="titlewrap"><div id="img_container"></div></div><p id="options"><a href="#" class="close button"><?php _e('Cancel'); ?></a><a href="#" class="refresh button"><?php _e('Refresh'); ?></a></p></div>');
</ins><span class="cx"> jQuery('#img_container').html(strtoappend);
</span><span class="cx"> <?php break;
</span><span class="cx"> }
</span><span class="lines">@@ -327,7 +291,6 @@
</span><span class="cx"> <title><?php _e('Press This') ?></title>
</span><span class="cx">
</span><span class="cx"> <?php
</span><del>- add_thickbox();
</del><span class="cx"> wp_enqueue_style( 'press-this' );
</span><span class="cx"> wp_enqueue_style( 'press-this-ie');
</span><span class="cx"> wp_enqueue_style( 'colors' );
</span><span class="lines">@@ -349,8 +312,7 @@
</span><span class="cx"> ?>
</span><span class="cx"> <script type="text/javascript">
</span><span class="cx"> function insert_plain_editor(text) {
</span><del>- edCanvas = document.getElementById('content');
- edInsertContent(edCanvas, text);
</del><ins>+ edInsertContent(text);
</ins><span class="cx"> }
</span><span class="cx"> function set_editor(text) {
</span><span class="cx"> if ( '' == text || '<p></p>' == text ) text = '<p><br /></p>';
</span><span class="lines">@@ -410,7 +372,10 @@
</span><span class="cx"> photostorage = false;
</span><span class="cx"> show('photo');
</span><span class="cx"> });
</span><del>- jQuery('#photo-add-url').attr('href', '?ajax=photo_thickbox_url&height=200&width=500');
</del><ins>+ jQuery('#photo-add-url').click(function(){
+ var form = jQuery('#photo-add-url-div').clone();
+ jQuery('#img_container').empty().append( form.show() );
+ });
</ins><span class="cx"> jQuery('#waiting').hide();
</span><span class="cx"> jQuery('#extra-fields').show();
</span><span class="cx"> }
</span><span class="lines">@@ -439,7 +404,7 @@
</span><span class="cx"> }
</span><span class="cx"> jQuery(document).ready(function($) {
</span><span class="cx"> //resize screen
</span><del>- window.resizeTo(720,540);
</del><ins>+ window.resizeTo(720,580);
</ins><span class="cx"> // set button actions
</span><span class="cx"> jQuery('#photo_button').click(function() { show('photo'); return false; });
</span><span class="cx"> jQuery('#video_button').click(function() { show('video'); return false; });
</span><span class="lines">@@ -461,11 +426,6 @@
</span><span class="cx"> </script>
</span><span class="cx"> </head>
</span><span class="cx"> <body class="press-this wp-admin">
</span><del>-<?php
-if ( user_can_richedit() ) {
- wp_tiny_mce( true, array( 'height' => '370' ) );
-}
-?>
</del><span class="cx"> <form action="press-this.php?action=post" method="post">
</span><span class="cx"> <div id="poststuff" class="metabox-holder">
</span><span class="cx"> <div id="side-info-column">
</span><span class="lines">@@ -564,9 +524,7 @@
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div id="tagsdiv-post_tag" class="postbox">
</span><del>- <div class="handlediv" title="<?php _e( 'Click to toggle' ); ?>">
- <br/>
- </div>
</del><ins>+ <div class="handlediv" title="<?php _e( 'Click to toggle' ); ?>"><br /></div>
</ins><span class="cx"> <h3><span><?php _e('Post Tags'); ?></span></h3>
</span><span class="cx"> <div class="inside">
</span><span class="cx"> <div class="tagsdiv" id="post_tag">
</span><span class="lines">@@ -596,8 +554,15 @@
</span><span class="cx"> </h1>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>- <?php if ( isset($posted) && intval($posted) ) { $post_ID = intval($posted); ?>
- <div id="message" class="updated"><p><strong><?php _e('Your post has been saved.'); ?></strong> <a onclick="window.opener.location.replace(this.href); window.close();" href="<?php echo get_permalink( $post_ID); ?>"><?php _e('View post'); ?></a> | <a href="<?php echo get_edit_post_link( $post_ID ); ?>" onclick="window.opener.location.replace(this.href); window.close();"><?php _e('Edit Post'); ?></a> | <a href="#" onclick="window.close();"><?php _e('Close Window'); ?></a></p></div>
</del><ins>+ <?php
+ if ( isset($posted) && intval($posted) ) {
+ $post_ID = intval($posted); ?>
+ <div id="message" class="updated">
+ <p><strong><?php _e('Your post has been saved.'); ?></strong>
+ <a onclick="window.opener.location.replace(this.href); window.close();" href="<?php echo get_permalink($post_ID); ?>"><?php _e('View post'); ?></a>
+ | <a href="<?php echo get_edit_post_link( $post_ID ); ?>" onclick="window.opener.location.replace(this.href); window.close();"><?php _e('Edit Post'); ?></a>
+ | <a href="#" onclick="window.close();"><?php _e('Close Window'); ?></a></p>
+ </div>
</ins><span class="cx"> <?php } ?>
</span><span class="cx">
</span><span class="cx"> <div id="titlediv">
</span><span class="lines">@@ -609,44 +574,64 @@
</span><span class="cx"> <div id="extra-fields" style="display: none"></div>
</span><span class="cx">
</span><span class="cx"> <div class="postdivrich">
</span><del>- <div id="editor-toolbar">
- <?php if ( user_can_richedit() ) :
- wp_print_scripts( 'quicktags' );
- add_filter('the_editor_content', 'wp_richedit_pre'); ?>
- <a id="edButtonHTML" onclick="switchEditors.go('content', 'html');"><?php _e('HTML'); ?></a>
- <a id="edButtonPreview" class="active" onclick="switchEditors.go('content', 'tinymce');"><?php _e('Visual'); ?></a>
- <div class="zerosize"><input accesskey="e" type="button" onclick="switchEditors.go('content')" /></div>
- <?php endif; ?>
</del><ins>+ <?php
</ins><span class="cx">
</span><del>- <div id="media-buttons">
- <?php
- _e( 'Add:' );
</del><ins>+ $editor_settings = array(
+ 'teeny' => true,
+ 'textarea_rows' => '15'
+ );
</ins><span class="cx">
</span><del>- if ( current_user_can('upload_files') ) : ?>
- <a id="photo_button" title="<?php _e('Insert an Image'); ?>" href="#">
-<img alt="<?php _e('Insert an Image'); ?>" src="<?php echo esc_url( admin_url( 'images/media-button-image.gif?ver=20100531' ) ); ?>"/></a><?php
- endif;
- ?><a id="video_button" title="<?php _e('Embed a Video'); ?>" href="#"><img alt="<?php _e('Embed a Video'); ?>" src="<?php echo esc_url( admin_url( 'images/media-button-video.gif?ver=20100531' ) ); ?>"/></a>
- </div>
- </div>
- <div id="quicktags"></div>
- <div class="editor-container">
- <textarea name="content" id="content" style="width:100%;" class="theEditor" rows="15"><?php
- if ( $selection )
- echo wp_richedit_pre($selection);
- if ( $url ) {
- echo '<p>';
- if ( $selection )
- _e('via ');
- printf( "<a href='%s'>%s</a>.</p>", esc_url( $url ), esc_html( $title ) );
- }
- ?></textarea>
- </div>
</del><ins>+ $content = '';
+ if ( $selection )
+ $content .= $selection;
+
+ if ( $url ) {
+ $content .= '<p>';
+
+ if ( $selection )
+ $content .= __('via ');
+
+ $content .= sprintf( "<a href='%s'>%s</a>.</p>", esc_url( $url ), esc_html( $title ) );
+ }
+
+ remove_action( 'media_buttons', 'media_buttons' );
+ add_action( 'media_buttons', 'press_this_media_buttons' );
+ function press_this_media_buttons() {
+ _e( 'Add:' );
+
+ if ( current_user_can('upload_files') ) {
+ ?>
+ <a id="photo_button" title="<?php _e('Insert an Image'); ?>" href="#">
+ <img alt="<?php _e('Insert an Image'); ?>" src="<?php echo esc_url( admin_url( 'images/media-button-image.gif?ver=20100531' ) ); ?>"/></a>
+ <?php
+ }
+ ?>
+ <a id="video_button" title="<?php _e('Embed a Video'); ?>" href="#"><img alt="<?php _e('Embed a Video'); ?>" src="<?php echo esc_url( admin_url( 'images/media-button-video.gif?ver=20100531' ) ); ?>"/></a>
+ <?php
+ }
+
+ wp_editor( $content, 'content', $editor_settings );
+
+ ?>
</ins><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx"> </form>
</span><del>-<?php do_action('admin_print_footer_scripts'); ?>
</del><ins>+<div id="photo-add-url-div" style="display:none;">
+ <table><tr>
+ <td><label for="this_photo"><?php _e('URL') ?></label></td>
+ <td><input type="text" id="this_photo" name="this_photo" class="tbtitle text" onkeypress="if(event.keyCode==13) image_selector();" /></td>
+ </tr><tr>
+ <td><label for="this_photo_description"><?php _e('Description') ?></label></td>
+ <td><input type="text" id="this_photo_description" name="photo_description" class="tbtitle text" onkeypress="if(event.keyCode==13) image_selector();" value="<?php echo esc_attr($title);?>"/></td>
+ </tr><tr>
+ <td><input type="button" class="button" onclick="image_selector()" value="<?php _e('Insert Image'); ?>" /></td>
+ </tr></table>
+</div>
+<?php
+do_action('admin_footer');
+do_action('admin_print_footer_scripts');
+?>
</ins><span class="cx"> <script type="text/javascript">if(typeof wpOnload=='function')wpOnload();</script>
</span><span class="cx"> </body>
</span><span class="cx"> </html>
</span></span></pre></div>
<a id="trunkwpincludesclasswpeditorphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class-wp-editor.php (18569 => 18570)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-wp-editor.php 2011-08-18 22:40:37 UTC (rev 18569)
+++ trunk/wp-includes/class-wp-editor.php 2011-08-19 01:14:56 UTC (rev 18570)
</span><span class="lines">@@ -48,6 +48,7 @@
</span><span class="cx"> 'editor_css' => '', // intended for extra styles for both visual and HTML editors buttons, needs to include the <style> tags, can use "scoped".
</span><span class="cx"> 'editor_class' => '', // add extra class(es) to the editor textarea
</span><span class="cx"> 'teeny' => false, // output the minimal editor config used in Press This
</span><ins>+ 'dfw' => false, // replace the default fullscreen with DFW (needs specific css)
</ins><span class="cx"> 'tinymce' => true, // load TinyMCE, can be used to pass settings directly to TinyMCE using an array()
</span><span class="cx"> 'quicktags' => true // load Quicktags, can be used to pass settings directly to Quicktags using an array()
</span><span class="cx"> ) );
</span><span class="lines">@@ -227,120 +228,120 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $plugins = array_unique( apply_filters('tiny_mce_plugins', $plugins) );
</span><ins>+ }
</ins><span class="cx">
</span><del>- if ( 'content' == $editor_id ) // enable DFW only on Add/Edit Post screens for now
- $plugins[] = 'wpfullscreen';
</del><ins>+ if ( $settings['dfw'] )
+ $plugins[] = 'wpfullscreen';
</ins><span class="cx">
</span><del>- $this->plugins = $plugins;
</del><ins>+ $this->plugins = $plugins;
</ins><span class="cx">
</span><del>- /*
- The following filter allows localization scripts to change the languages displayed in the spellchecker's drop-down menu.
- By default it uses Google's spellchecker API, but can be configured to use PSpell/ASpell if installed on the server.
- The + sign marks the default language. More information:
- http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/spellchecker
- */
- $mce_spellchecker_languages = apply_filters('mce_spellchecker_languages', '+English=en,Danish=da,Dutch=nl,Finnish=fi,French=fr,German=de,Italian=it,Polish=pl,Portuguese=pt,Spanish=es,Swedish=sv');
</del><ins>+ /*
+ The following filter allows localization scripts to change the languages displayed in the spellchecker's drop-down menu.
+ By default it uses Google's spellchecker API, but can be configured to use PSpell/ASpell if installed on the server.
+ The + sign marks the default language. More information:
+ http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/spellchecker
+ */
+ $mce_spellchecker_languages = apply_filters('mce_spellchecker_languages', '+English=en,Danish=da,Dutch=nl,Finnish=fi,French=fr,German=de,Italian=it,Polish=pl,Portuguese=pt,Spanish=es,Swedish=sv');
</ins><span class="cx">
</span><del>- $this->first_init = array(
- 'mode' => 'exact',
- 'width' => '100%',
- 'theme' => 'advanced',
- 'skin' => 'wp_theme',
- 'language' => $this->mce_locale,
- 'spellchecker_languages' => $mce_spellchecker_languages,
- 'theme_advanced_toolbar_location' => 'top',
- 'theme_advanced_toolbar_align' => 'left',
- 'theme_advanced_statusbar_location' => 'bottom',
- 'theme_advanced_resizing' => true,
- 'theme_advanced_resize_horizontal' => false,
- 'dialog_type' => 'modal',
- 'formats' => "{
- alignleft : [
- {selector : 'p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li', styles : {textAlign : 'left'}},
- {selector : 'img,table', classes : 'alignleft'}
- ],
- aligncenter : [
- {selector : 'p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li', styles : {textAlign : 'center'}},
- {selector : 'img,table', classes : 'aligncenter'}
- ],
- alignright : [
- {selector : 'p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li', styles : {textAlign : 'right'}},
- {selector : 'img,table', classes : 'alignright'}
- ],
- strikethrough : {inline : 'del'}
- }",
- 'relative_urls' => false,
- 'remove_script_host' => false,
- 'convert_urls' => false,
- 'remove_linebreaks' => true,
- 'gecko_spellcheck' => true,
- 'keep_styles' => false,
- 'entities' => '38,amp,60,lt,62,gt',
- 'accessibility_focus' => true,
- 'tabfocus_elements' => 'major-publishing-actions',
- 'media_strict' => false,
- 'paste_remove_styles' => true,
- 'paste_remove_spans' => true,
- 'paste_strip_class_attributes' => 'all',
- 'paste_text_use_dialog' => true,
- 'extended_valid_elements' => 'article[*],aside[*],audio[*],canvas[*],command[*],datalist[*],details[*],embed[*],figcaption[*],figure[*],footer[*],header[*],hgroup[*],keygen[*],mark[*],meter[*],nav[*],output[*],progress[*],section[*],source[*],summary,time[*],video[*],wbr',
- 'wpeditimage_disable_captions' => $no_captions,
- 'wp_fullscreen_content_css' => "$this->baseurl/plugins/wpfullscreen/css/wp-fullscreen.css",
- 'plugins' => implode( ',', $plugins )
- );
</del><ins>+ $this->first_init = array(
+ 'mode' => 'exact',
+ 'width' => '100%',
+ 'theme' => 'advanced',
+ 'skin' => 'wp_theme',
+ 'language' => $this->mce_locale,
+ 'spellchecker_languages' => $mce_spellchecker_languages,
+ 'theme_advanced_toolbar_location' => 'top',
+ 'theme_advanced_toolbar_align' => 'left',
+ 'theme_advanced_statusbar_location' => 'bottom',
+ 'theme_advanced_resizing' => true,
+ 'theme_advanced_resize_horizontal' => false,
+ 'dialog_type' => 'modal',
+ 'formats' => "{
+ alignleft : [
+ {selector : 'p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li', styles : {textAlign : 'left'}},
+ {selector : 'img,table', classes : 'alignleft'}
+ ],
+ aligncenter : [
+ {selector : 'p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li', styles : {textAlign : 'center'}},
+ {selector : 'img,table', classes : 'aligncenter'}
+ ],
+ alignright : [
+ {selector : 'p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li', styles : {textAlign : 'right'}},
+ {selector : 'img,table', classes : 'alignright'}
+ ],
+ strikethrough : {inline : 'del'}
+ }",
+ 'relative_urls' => false,
+ 'remove_script_host' => false,
+ 'convert_urls' => false,
+ 'remove_linebreaks' => true,
+ 'gecko_spellcheck' => true,
+ 'keep_styles' => false,
+ 'entities' => '38,amp,60,lt,62,gt',
+ 'accessibility_focus' => true,
+ 'tabfocus_elements' => 'major-publishing-actions',
+ 'media_strict' => false,
+ 'paste_remove_styles' => true,
+ 'paste_remove_spans' => true,
+ 'paste_strip_class_attributes' => 'all',
+ 'paste_text_use_dialog' => true,
+ 'extended_valid_elements' => 'article[*],aside[*],audio[*],canvas[*],command[*],datalist[*],details[*],embed[*],figcaption[*],figure[*],footer[*],header[*],hgroup[*],keygen[*],mark[*],meter[*],nav[*],output[*],progress[*],section[*],source[*],summary,time[*],video[*],wbr',
+ 'wpeditimage_disable_captions' => $no_captions,
+ 'wp_fullscreen_content_css' => "$this->baseurl/plugins/wpfullscreen/css/wp-fullscreen.css",
+ 'plugins' => implode( ',', $plugins )
+ );
</ins><span class="cx">
</span><del>- // load editor_style.css if the current theme supports it
- if ( ! empty( $editor_styles ) && is_array( $editor_styles ) ) {
- $mce_css = array();
- $style_uri = get_stylesheet_directory_uri();
- if ( ! is_child_theme() ) {
- foreach ( $editor_styles as $file )
</del><ins>+ // load editor_style.css if the current theme supports it
+ if ( ! empty( $editor_styles ) && is_array( $editor_styles ) ) {
+ $mce_css = array();
+ $style_uri = get_stylesheet_directory_uri();
+ if ( ! is_child_theme() ) {
+ foreach ( $editor_styles as $file )
+ $mce_css[] = "$style_uri/$file";
+ } else {
+ $style_dir = get_stylesheet_directory();
+ $template_uri = get_template_directory_uri();
+ $template_dir = get_template_directory();
+ foreach ( $editor_styles as $file ) {
+ if ( file_exists( "$template_dir/$file" ) )
+ $mce_css[] = "$template_uri/$file";
+ if ( file_exists( "$style_dir/$file" ) )
</ins><span class="cx"> $mce_css[] = "$style_uri/$file";
</span><del>- } else {
- $style_dir = get_stylesheet_directory();
- $template_uri = get_template_directory_uri();
- $template_dir = get_template_directory();
- foreach ( $editor_styles as $file ) {
- if ( file_exists( "$template_dir/$file" ) )
- $mce_css[] = "$template_uri/$file";
- if ( file_exists( "$style_dir/$file" ) )
- $mce_css[] = "$style_uri/$file";
- }
</del><span class="cx"> }
</span><del>- $mce_css = implode( ',', $mce_css );
- } else {
- $mce_css = '';
</del><span class="cx"> }
</span><ins>+ $mce_css = implode( ',', $mce_css );
+ } else {
+ $mce_css = '';
+ }
</ins><span class="cx">
</span><del>- $mce_css = trim( apply_filters( 'mce_css', $mce_css ), ' ,' );
</del><ins>+ $mce_css = trim( apply_filters( 'mce_css', $mce_css ), ' ,' );
</ins><span class="cx">
</span><del>- if ( ! empty($mce_css) )
- $this->first_init['content_css'] = $mce_css;
- }
</del><ins>+ if ( ! empty($mce_css) )
+ $this->first_init['content_css'] = $mce_css;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( $settings['teeny'] ) {
</span><del>- $mce_buttons = apply_filters( 'teeny_mce_buttons', array('bold, italic, underline, blockquote, separator, strikethrough, bullist, numlist,justifyleft, justifycenter, justifyright, undo, redo, link, unlink, fullscreen'), $editor_id );
</del><ins>+ $mce_buttons = apply_filters( 'teeny_mce_buttons', array('bold', 'italic', 'underline', 'blockquote', 'separator', 'strikethrough', 'bullist', 'numlist', 'justifyleft', 'justifycenter', 'justifyright', 'undo', 'redo', 'link', 'unlink', 'fullscreen'), $editor_id );
</ins><span class="cx"> $mce_buttons_2 = $mce_buttons_3 = $mce_buttons_4 = array();
</span><span class="cx"> } else {
</span><del>- $mce_buttons = apply_filters('mce_buttons', array('bold', 'italic', 'strikethrough', '|', 'bullist', 'numlist', 'blockquote', '|', 'justifyleft', 'justifycenter', 'justifyright', '|', 'link', 'unlink', 'wp_more', '|', 'spellchecker', 'fullscreen', 'wp_fullscreen', 'wp_adv' ), $editor_id);
</del><ins>+ $mce_buttons = apply_filters('mce_buttons', array('bold', 'italic', 'strikethrough', '|', 'bullist', 'numlist', 'blockquote', '|', 'justifyleft', 'justifycenter', 'justifyright', '|', 'link', 'unlink', 'wp_more', '|', 'spellchecker', 'fullscreen', 'wp_adv' ), $editor_id);
</ins><span class="cx"> $mce_buttons_2 = apply_filters('mce_buttons_2', array( 'formatselect', 'underline', 'justifyfull', 'forecolor', '|', 'pastetext', 'pasteword', 'removeformat', '|', 'charmap', '|', 'outdent', 'indent', '|', 'undo', 'redo', 'wp_help' ), $editor_id);
</span><span class="cx"> $mce_buttons_3 = apply_filters('mce_buttons_3', array(), $editor_id);
</span><span class="cx"> $mce_buttons_4 = apply_filters('mce_buttons_4', array(), $editor_id);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( 'content' == $editor_id )
- $arg = array('fullscreen');
- else
- $arg = array('wp_fullscreen');
</del><ins>+ if ( $settings['dfw'] ) {
+ function replace_fullscreen(&$val) {
+ if ( $val == 'fullscreen' )
+ $val = 'wp_fullscreen';
+ }
</ins><span class="cx">
</span><del>- $_buttons = compact('mce_buttons', 'mce_buttons_2', 'mce_buttons_3', 'mce_buttons_4');
- foreach ( $_buttons as $key => $val ) {
- $_buttons[$key] = array_diff( $val, $arg );
</del><ins>+ array_walk($mce_buttons, 'replace_fullscreen');
+ array_walk($mce_buttons_2, 'replace_fullscreen');
+ array_walk($mce_buttons_3, 'replace_fullscreen');
+ array_walk($mce_buttons_4, 'replace_fullscreen');
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- extract($_buttons, EXTR_OVERWRITE);
-
</del><span class="cx"> $mceInit = array (
</span><span class="cx"> 'elements' => $editor_id,
</span><span class="cx"> 'wpautop' => (bool) $settings['wpautop'],
</span></span></pre></div>
<a id="trunkwpincludesscriptloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/script-loader.php (18569 => 18570)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/script-loader.php 2011-08-18 22:40:37 UTC (rev 18569)
+++ trunk/wp-includes/script-loader.php 2011-08-19 01:14:56 UTC (rev 18570)
</span><span class="lines">@@ -424,7 +424,7 @@
</span><span class="cx"> $styles->add( 'dashboard', "/wp-admin/css/dashboard$suffix.css", array(), '20110815' );
</span><span class="cx"> $styles->add( 'install', "/wp-admin/css/install$suffix.css", array(), '20110707' ); // Readme as well
</span><span class="cx"> $styles->add( 'theme-editor', "/wp-admin/css/theme-editor$suffix.css", array(), '20110602' );
</span><del>- $styles->add( 'press-this', "/wp-admin/css/press-this$suffix.css", array(), '20110707' );
</del><ins>+ $styles->add( 'press-this', "/wp-admin/css/press-this$suffix.css", array(), '20110818' );
</ins><span class="cx"> $styles->add( 'thickbox', '/wp-includes/js/thickbox/thickbox.css', array(), '20090514' );
</span><span class="cx"> $styles->add( 'login', "/wp-admin/css/login$suffix.css", array(), '20110610' );
</span><span class="cx"> $styles->add( 'plugin-install', "/wp-admin/css/plugin-install$suffix.css", array(), '20110810' );
</span></span></pre>
</div>
</div>
</body>
</html>