<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[12094] trunk: PressThis fixes from noel, fixes #11011</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12094">12094</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2009-10-23 04:32:56 +0000 (Fri, 23 Oct 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>PressThis fixes from noel, fixes <a href="http://trac.wordpress.org/ticket/11011">#11011</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="#trunkwpadminpressthisphp">trunk/wp-admin/press-this.php</a></li>
<li><a href="#trunkwpincludeslinktemplatephp">trunk/wp-includes/link-template.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 (12093 => 12094)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/css/press-this.css 2009-10-22 21:06:33 UTC (rev 12093)
+++ trunk/wp-admin/css/press-this.css 2009-10-23 04:32:56 UTC (rev 12094)
</span><span class="lines">@@ -1 +1 @@
</span><del>-body{font:13px "Lucida Grande",Verdana,Arial,"Bitstream Vera Sans",sans-serif;color:#333;margin:0;padding:0;}img{border:none;}#wphead{border-top:none;padding-top:4px;background:#444!important;}.tagchecklist span a{background:transparent url(../images/xit.gif) no-repeat 0 0;}#poststuff #edButtonPreview,#poststuff #edButtonHTML{-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-radius:3px;border-style:solid;border-width:1px;cursor:pointer;display:block;height:18px;margin:0 5px 0 0;padding:0 5px 0;font-size:10px;line-height:18px;float:left;}.howto{margin-top:2px;margin-bottom:3px;font-size:11px;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:6px;-khtml-border-radius:6px;-webkit-border-radius:6px;border-radius:6px;}div#poststuff{margin:10px;}div.zerosize{border:0 none;height:0;margin:0;overflow:hidden;padding:0;position:absolute;width:0;}#poststuff #edButtonPreview.active,#poststuff #edButtonHTML.active{display:none;}.posting{margin-right:212px;position:relative;left:0;}* html .posting{width:470px;}#side-info-column{float:right;width:200px;}#side-info-column .sleeve{padding-top:5px;}#poststuff .inside{font-size:11px;margin:8px;}#poststuff h2,#poststuff h3{font-size:12px;font-weight:bold;line-height:1;margin:0;padding:7px 9px;}#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:6px;-khtml-border-radius:6px;-webkit-border-radius:6px;border-radius:6px;}.postbox,.stuffbox{margin-bottom:10px;border-width:1px;border-style:solid;line-height:1;-moz-border-radius:6px;-khtml-border-radius:6px;-webkit-border-radius:6px;border-radius:6px;}#title,.tbtitle{-moz-border-radius:6px;-khtml-border-radius:6px;-webkit-border-radius:6px;border-radius:6px;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:6px;-khtml-border-radius:6px;-webkit-border-radius:6px;border-radius:6px;border:1px solid #dfdfdf;background-color:#fff;}.postdivrich{position:relative;padding-top:25px;}#actions{float:right;margin:-19px 0 0;}#extra_fields #actions{clear:both;position:relative;right:0;margin:-24px 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;}.photolist{margin-top:-10px;}#photo_saving{margin:0 8px 8px;vertical-align:middle;}#img_container{background-color:#fff;}#img_container_container{overflow:auto;}#extra_fields{margin-top:10px;position:relative;}#extra_fields .postbox{margin-bottom:5px;}#extra_fields .titlewrap{padding:0;overflow:auto;height:100px;}#img_container{position:relative;}#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;}#viewsite{padding:0;margin:0 0 20px 0;font-size:10px;clear:both;}#viewsite .button{margin:0;display:block;}.wp-hidden-children .wp-hidden-child{display:none;}#category-adder{padding:4px 0;}#category-adder h4{margin:0 0 8px;}#category-add input{width:94%;font-family:Verdana,Arial,Helvetica,sans-serif;font-size:13px;margin:1px;padding:3px;}#category-add select{width:70%;-x-system-font:none;border-style:solid;border-width:1px;font-family:"Lucida Grande","Bitstream Vera Sans",Verdana,Arial,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 ul,#linkcategorydiv ul{list-style:none;padding:0;margin:0;}#categorydiv ul.categorychecklist ul{margin-left:18px;}#categorydiv div.tabs-panel{height:140px;overflow:auto;}ul.categorychecklist li{margin:0;padding:0;line-height:19px;}.screen-reader-text{display:none;}.tagsdiv .newtag{margin-right:5px;}.jaxtag{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:11px;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;}#saving{display:inline;vertical-align:middle;}.submit input,.button,.button-primary,.button-secondary,.button-highlighted,#postcustomstuff .submit input{font-family:"Lucida Grande",Verdana,Arial,"Bitstream Vera Sans",sans-serif;text-decoration:none;font-size:11px!important;line-height:16px;padding:2px 8px;cursor:pointer;border-width:1px;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: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 6px 0 0;visibility:hidden;}input.newtag ~ div.taghint{visibility:visible;}input.newtag:focus ~ div.taghint{visibility:hidden;}
</del><span class="cx">\ No newline at end of file
</span><ins>+body{font:13px "Lucida Grande",Verdana,Arial,"Bitstream Vera Sans",sans-serif;color:#333;margin:0;padding:0;min-width:675px;min-height:400px;}img{border:none;}#wphead{border-top:none;padding-top:4px;background:#444!important;}.tagchecklist span a{background:transparent url(../images/xit.gif) no-repeat 0 0;}#poststuff #edButtonPreview,#poststuff #edButtonHTML{-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-radius:3px;border-style:solid;border-width:1px;cursor:pointer;display:block;height:18px;margin:0 5px 0 0;padding:0 5px 0;font-size:10px;line-height:18px;float:left;}.howto{margin-top:2px;margin-bottom:3px;font-size:11px;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:6px;-khtml-border-radius:6px;-webkit-border-radius:6px;border-radius:6px;}div#poststuff{margin:10px;}div.zerosize{border:0 none;height:0;margin:0;overflow:hidden;padding:0;width:0;}#poststuff #edButtonPreview.active,#poststuff #edButtonHTML.active{display:none;}.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:11px;margin:8px;}#poststuff h2,#poststuff h3{font-size:12px;font-weight:bold;line-height:1;margin:0;padding:7px 9px;}#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:6px;-khtml-border-radius:6px;-webkit-border-radius:6px;border-radius:6px;}.postbox,.stuffbox{margin-bottom:10px;border-width:1px;border-style:solid;line-height:1;-moz-border-radius:6px;-khtml-border-radius:6px;-webkit-border-radius:6px;border-radius:6px;}.stuffbox:hover .handlediv{background:transparent url(../images/menu-bits-vs.gif) no-repeat scroll left -111px;}.handlediv{float:right;height:26px;width:23px;}#title,.tbtitle{-moz-border-radius:6px;-khtml-border-radius:6px;-webkit-border-radius:6px;border-radius:6px;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:6px;-khtml-border-radius:6px;-webkit-border-radius:6px;border-radius:6px;border:1px solid #dfdfdf;background-color:#fff;}.postdivrich{padding-top:25px;position:relative;}.actions{float:right;margin:-19px 0 0;}#extra-fields .actions{margin:-15px -5px 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;}.photolist{margin-top:-10px;}#photo_saving{margin:0 8px 8px;vertical-align:middle;}#img_container{background-color:#fff;}#img_container_container{overflow:auto;}#extra-fields{margin-top:10px;position:relative;}#waiting{margin-top:10px;}#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;}#viewsite{padding:0;margin:0 0 20px 5px;font-size:10px;clear:both;}.wp-hidden-children .wp-hidden-child{display:none;}#category-adder{padding:4px 0;}#category-adder h4{margin:0 0 8px;}#category-add input{width:94%;font-family:Verdana,Arial,Helvetica,sans-serif;font-size:13px;margin:1px;padding:3px;}#category-add select{width:70%;-x-system-font:none;border-style:solid;border-width:1px;font-family:"Lucida Grande","Bitstream Vera Sans",Verdana,Arial,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 ul,#linkcategorydiv ul{list-style:none;padding:0;margin:0;}#categorydiv ul.categorychecklist ul{margin-left:18px;}#categorydiv div.tabs-panel{height:140px;overflow:auto;}ul.categorychecklist li{margin:0;padding:0;line-height:19px;}.screen-reader-text{display:none;}.tagsdiv .newtag{margin-right:5px;}.jaxtag{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:11px;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;}#saving{display:inline;vertical-align:middle;}.submit input,.button,.button-primary,.button-secondary,.button-highlighted,#postcustomstuff .submit input{font-family:"Lucida Grande",Verdana,Arial,"Bitstream Vera Sans",sans-serif;text-decoration:none;font-size:11px!important;line-height:16px;padding:2px 8px;cursor:pointer;border-width:1px;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: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;}
</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 (12093 => 12094)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/css/press-this.dev.css 2009-10-22 21:06:33 UTC (rev 12093)
+++ trunk/wp-admin/css/press-this.dev.css 2009-10-23 04:32:56 UTC (rev 12094)
</span><span class="lines">@@ -1,8 +1,11 @@
</span><ins>+
</ins><span class="cx"> body {
</span><del>- font: 13px "Lucida Grande", Verdana, Arial, "Bitstream Vera Sans", sans-serif;
</del><ins>+ font: 13px "Lucida Grande",Verdana,Arial,"Bitstream Vera Sans",sans-serif;
</ins><span class="cx"> color: #333;
</span><span class="cx"> margin: 0;
</span><span class="cx"> padding: 0;
</span><ins>+ min-width: 675px;
+ min-height: 400px;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> img {
</span><span class="lines">@@ -17,7 +20,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .tagchecklist span a {
</span><del>-background: transparent url(../images/xit.gif) no-repeat 0 0;
</del><ins>+ background: transparent url(../images/xit.gif) no-repeat 0 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #poststuff #edButtonPreview,
</span><span class="lines">@@ -74,7 +77,6 @@
</span><span class="cx"> margin: 0;
</span><span class="cx"> overflow: hidden;
</span><span class="cx"> padding: 0;
</span><del>- position: absolute;
</del><span class="cx"> width: 0;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -86,16 +88,13 @@
</span><span class="cx"> .posting {
</span><span class="cx"> margin-right: 212px;
</span><span class="cx"> position: relative;
</span><del>- left: 0;
</del><span class="cx"> }
</span><span class="cx">
</span><del>-* html .posting {
- width: 470px;
-}
-
</del><span class="cx"> #side-info-column {
</span><span class="cx"> float: right;
</span><span class="cx"> width: 200px;
</span><ins>+ position: relative;
+ right: 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #side-info-column .sleeve {
</span><span class="lines">@@ -107,7 +106,7 @@
</span><span class="cx"> margin: 8px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#poststuff h2, #poststuff h3 {
</del><ins>+#poststuff h2,#poststuff h3 {
</ins><span class="cx"> font-size: 12px;
</span><span class="cx"> font-weight: bold;
</span><span class="cx"> line-height: 1;
</span><span class="lines">@@ -147,6 +146,16 @@
</span><span class="cx"> border-radius: 6px;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+.stuffbox:hover .handlediv {
+ background: transparent url(../images/menu-bits-vs.gif) no-repeat scroll left -111px;
+}
+
+.handlediv {
+ float: right;
+ height: 26px;
+ width: 23px;
+}
+
</ins><span class="cx"> #title,
</span><span class="cx"> .tbtitle {
</span><span class="cx"> -moz-border-radius: 6px;
</span><span class="lines">@@ -167,7 +176,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #title {
</span><del>- width: 97%;
</del><ins>+width: 97%;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .editor-container {
</span><span class="lines">@@ -180,29 +189,26 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> .postdivrich {
</span><ins>+ padding-top: 25px;
</ins><span class="cx"> position: relative;
</span><del>- padding-top: 25px;
</del><span class="cx"> }
</span><span class="cx">
</span><del>-#actions {
</del><ins>+.actions {
</ins><span class="cx"> float: right;
</span><span class="cx"> margin: -19px 0 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#extra_fields #actions {
- clear: both;
- position: relative;
- right: 0px;
- margin: -24px 0 0;
</del><ins>+#extra-fields .actions {
+ margin: -15px -5px 0 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#actions li {
</del><ins>+.actions li {
</ins><span class="cx"> float: left;
</span><span class="cx"> list-style: none;
</span><span class="cx"> margin-right: 10px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#extra_fields .button {
</del><ins>+#extra-fields .button {
</ins><span class="cx"> margin-right: 5px;
</span><span class="cx"> padding: 3px 6px;
</span><span class="cx"> border-radius: 10px;
</span><span class="lines">@@ -224,29 +230,30 @@
</span><span class="cx"> #img_container {
</span><span class="cx"> background-color: #fff;
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> #img_container_container {
</span><span class="cx"> overflow: auto;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#extra_fields {
</del><ins>+#extra-fields {
</ins><span class="cx"> margin-top: 10px;
</span><span class="cx"> position: relative;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#extra_fields .postbox {
</del><ins>+#waiting {
+ margin-top: 10px;
+}
+
+#extra-fields .postbox {
</ins><span class="cx"> margin-bottom: 5px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#extra_fields .titlewrap {
</del><ins>+#extra-fields .titlewrap {
</ins><span class="cx"> padding: 0;
</span><span class="cx"> overflow: auto;
</span><span class="cx"> height: 100px;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#img_container {
- position: relative;
-}
-
</del><span class="cx"> #img_container a {
</span><span class="cx"> display: block;
</span><span class="cx"> float: left;
</span><span class="lines">@@ -291,16 +298,11 @@
</span><span class="cx"> /* Submit Column */
</span><span class="cx"> #viewsite {
</span><span class="cx"> padding: 0;
</span><del>- margin: 0 0 20px 0;
</del><ins>+ margin: 0 0 20px 5px;
</ins><span class="cx"> font-size: 10px;
</span><span class="cx"> clear: both;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#viewsite .button {
- margin: 0;
- display: block;
-}
-
</del><span class="cx"> .wp-hidden-children
</span><span class="cx"> .wp-hidden-child {
</span><span class="cx"> display: none;
</span><span class="lines">@@ -316,7 +318,7 @@
</span><span class="cx">
</span><span class="cx"> #category-add input {
</span><span class="cx"> width: 94%;
</span><del>- font-family: Verdana, Arial, Helvetica, sans-serif;
</del><ins>+ font-family: Verdana,Arial,Helvetica,sans-serif;
</ins><span class="cx"> font-size: 13px;
</span><span class="cx"> margin: 1px;
</span><span class="cx"> padding: 3px;
</span><span class="lines">@@ -327,7 +329,7 @@
</span><span class="cx"> -x-system-font: none;
</span><span class="cx"> border-style: solid;
</span><span class="cx"> border-width: 1px;
</span><del>- font-family: "Lucida Grande", "Bitstream Vera Sans", Verdana, Arial, sans-serif;
</del><ins>+ font-family: "Lucida Grande","Bitstream Vera Sans",Verdana,Arial,sans-serif;
</ins><span class="cx"> font-size: 12px;
</span><span class="cx"> height: 2em;
</span><span class="cx"> line-height: 20px;
</span><span class="lines">@@ -368,6 +370,7 @@
</span><span class="cx"> .screen-reader-text {
</span><span class="cx"> display: none;
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> .tagsdiv .newtag {
</span><span class="cx"> margin-right: 5px;
</span><span class="cx"> }
</span><span class="lines">@@ -425,7 +428,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /* Submit */
</span><del>-
</del><span class="cx"> #saving {
</span><span class="cx"> display: inline;
</span><span class="cx"> vertical-align: middle;
</span><span class="lines">@@ -437,7 +439,7 @@
</span><span class="cx"> .button-secondary,
</span><span class="cx"> .button-highlighted,
</span><span class="cx"> #postcustomstuff .submit input {
</span><del>- font-family: "Lucida Grande", Verdana, Arial, "Bitstream Vera Sans", sans-serif;
</del><ins>+ font-family: "Lucida Grande",Verdana,Arial,"Bitstream Vera Sans",sans-serif;
</ins><span class="cx"> text-decoration: none;
</span><span class="cx"> font-size: 11px !important;
</span><span class="cx"> line-height: 16px;
</span><span class="lines">@@ -542,6 +544,7 @@
</span><span class="cx"> #footer p a {
</span><span class="cx"> text-decoration: none;
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> #footer p a:hover {
</span><span class="cx"> text-decoration: underline;
</span><span class="cx"> }
</span><span class="lines">@@ -566,7 +569,7 @@
</span><span class="cx"> /* tag hints */
</span><span class="cx"> .taghint {
</span><span class="cx"> color: #aaa;
</span><del>- margin: -17px 6px 0 0;
</del><ins>+ margin: -17px 0 0 7px;
</ins><span class="cx"> visibility: hidden;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminpressthisphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/press-this.php (12093 => 12094)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/press-this.php 2009-10-22 21:06:33 UTC (rev 12093)
+++ trunk/wp-admin/press-this.php 2009-10-23 04:32:56 UTC (rev 12094)
</span><span class="lines">@@ -100,19 +100,19 @@
</span><span class="cx"> $url = isset($_GET['u']) ? esc_url($_GET['u']) : '';
</span><span class="cx"> $image = isset($_GET['i']) ? $_GET['i'] : '';
</span><span class="cx">
</span><del>-if ( !empty($_GET['ajax']) ) {
- switch ($_GET['ajax']) {
</del><ins>+if ( !empty($_REQUEST['ajax']) ) {
+ switch ($_REQUEST['ajax']) {
</ins><span class="cx"> case 'video': ?>
</span><span class="cx"> <script type="text/javascript" charset="utf-8">
</span><span class="cx"> /* <![CDATA[ */
</span><span class="cx"> jQuery('.select').click(function() {
</span><span class="cx"> append_editor(jQuery('#embed-code').val());
</span><del>- jQuery('#extra_fields').hide();
- jQuery('#extra_fields').html('');
</del><ins>+ jQuery('#extra-fields').hide();
+ jQuery('#extra-fields').html('');
</ins><span class="cx"> });
</span><span class="cx"> jQuery('.close').click(function() {
</span><del>- jQuery('#extra_fields').hide();
- jQuery('#extra_fields').html('');
</del><ins>+ jQuery('#extra-fields').hide();
+ jQuery('#extra-fields').html('');
</ins><span class="cx"> });
</span><span class="cx"> /* ]]> */
</span><span class="cx"> </script>
</span><span class="lines">@@ -192,13 +192,14 @@
</span><span class="cx"> * @return string
</span><span class="cx"> */
</span><span class="cx"> function get_images_from_uri($uri) {
</span><ins>+ $uri = preg_replace('/\/#.+?$/','', $uri);
</ins><span class="cx"> if( preg_match('/\.(jpg|jpe|jpeg|png|gif)$/', $uri) && !strpos($uri,'blogger.com') )
</span><span class="cx"> return "'".html_entity_decode($uri)."'";
</span><span class="cx"> $content = wp_remote_fopen($uri);
</span><span class="cx"> if ( false === $content )
</span><span class="cx"> return '';
</span><span class="cx"> $host = parse_url($uri);
</span><del>- $pattern = '/<img ([^>]*)src=(\"|\')([^<>]+?\.(png|jpeg|jpg|jpe|gif)[^<>\'\"]*)(\2)([^>]*)\/*>/is';
</del><ins>+ $pattern = '/<img ([^>]*)src=(\"|\')([^<>\'\"]+)(\2)([^>]*)\/*>/is';
</ins><span class="cx"> preg_match_all($pattern, $content, $matches);
</span><span class="cx"> if ( empty($matches[0]) )
</span><span class="cx"> return '';
</span><span class="lines">@@ -215,15 +216,15 @@
</span><span class="cx"> }
</span><span class="cx"> return "'" . implode("','", $sources) . "'";
</span><span class="cx"> }
</span><del>- $url = urldecode($url);
</del><ins>+ $url = wp_kses(urldecode($url), null);
</ins><span class="cx"> echo 'new Array('.get_images_from_uri($url).')';
</span><del>-
</del><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case 'photo_js': ?>
</span><span class="cx"> // gather images and load some default JS
</span><span class="cx"> var last = null
</span><span class="cx"> var img, img_tag, aspect, w, h, skip, i, strtoappend = "";
</span><ins>+ if(photostorage == false) {
</ins><span class="cx"> var my_src = eval(
</span><span class="cx"> jQuery.ajax({
</span><span class="cx"> type: "GET",
</span><span class="lines">@@ -249,7 +250,7 @@
</span><span class="cx"> strtoappend = '<?php _e('Unable to retrieve images or no images on page.'); ?>';
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
</del><ins>+ }
</ins><span class="cx"> for (i = 0; i < my_src.length; i++) {
</span><span class="cx"> img = new Image();
</span><span class="cx"> img.src = my_src[i];
</span><span class="lines">@@ -294,26 +295,12 @@
</span><span class="cx"> desc = jQuery('#this_photo_description').val();
</span><span class="cx"> src = jQuery('#this_photo').val();
</span><span class="cx"> pick(src, desc);
</span><del>- jQuery('#extra_fields').hide();
- jQuery('#extra_fields').html('');
</del><ins>+ jQuery('#extra-fields').hide();
+ jQuery('#extra-fields').html('');
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><del>-
- jQuery(document).ready(function() {
- jQuery('#extra_fields').html('<div class="postbox"><h2>Photo <small id="photo_directions">(<?php _e("click images to select") ?>)</small></h2><ul id="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>');
- jQuery('.close').click(function() {
- jQuery('#extra_fields').hide();
- jQuery('#extra_fields').html('');
- });
- jQuery('.refresh').click(function() {
- show('photo');
- });
</del><ins>+ jQuery('#extra-fields').html('<div class="postbox"><h2>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>');
</ins><span class="cx"> jQuery('#img_container').html(strtoappend);
</span><del>- jQuery('#photo_add_url').attr('href', '?ajax=photo_thickbox_url&height=200&width=500');
- tb_init('#extra_fields .thickbox');
-
-
- });
</del><span class="cx"> <?php break;
</span><span class="cx"> }
</span><span class="cx"> die;
</span><span class="lines">@@ -328,17 +315,18 @@
</span><span class="cx">
</span><span class="cx"> <?php
</span><span class="cx"> add_thickbox();
</span><del>- wp_enqueue_style('press-this');
- wp_enqueue_style('press-this-ie');
</del><ins>+ wp_enqueue_style( 'press-this' );
+ wp_enqueue_style( 'press-this-ie');
</ins><span class="cx"> wp_enqueue_style( 'colors' );
</span><span class="cx"> wp_enqueue_script( 'post' );
</span><del>- wp_enqueue_script('editor');
</del><ins>+ wp_enqueue_script( 'editor' );
</ins><span class="cx"> ?>
</span><span class="cx"> <script type="text/javascript">
</span><span class="cx"> //<![CDATA[
</span><span class="cx"> addLoadEvent = function(func){if(typeof jQuery!="undefined")jQuery(document).ready(func);else if(typeof wpOnload!='function'){wpOnload=func;}else{var oldonload=wpOnload;wpOnload=function(){oldonload();func();}}};
</span><span class="cx"> var userSettings = {'url':'<?php echo SITECOOKIEPATH; ?>','uid':'<?php if ( ! isset($current_user) ) $current_user = wp_get_current_user(); echo $current_user->ID; ?>','time':'<?php echo time() ?>'};
</span><span class="cx"> var ajaxurl = '<?php echo admin_url('admin-ajax.php'); ?>', pagenow = 'press-this';
</span><ins>+var photostorage = false;
</ins><span class="cx"> //]]>
</span><span class="cx"> </script>
</span><span class="cx">
</span><span class="lines">@@ -376,11 +364,10 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function show(tab_name) {
</span><del>- jQuery('#extra_fields').html('');
- jQuery('#extra_fields').show();
</del><ins>+ jQuery('#extra-fields').html('');
</ins><span class="cx"> switch(tab_name) {
</span><span class="cx"> case 'video' :
</span><del>- jQuery('#extra_fields').load('<?php echo esc_url($_SERVER['PHP_SELF']); ?>', { ajax: 'video', s: '<?php echo esc_attr($selection); ?>'}, function() {
</del><ins>+ jQuery('#extra-fields').load('<?php echo esc_url($_SERVER['PHP_SELF']); ?>', { ajax: 'video', s: '<?php echo esc_attr($selection); ?>'}, function() {
</ins><span class="cx"> <?php
</span><span class="cx"> $content = '';
</span><span class="cx"> if ( preg_match("/youtube\.com\/watch/i", $url) ) {
</span><span class="lines">@@ -402,27 +389,50 @@
</span><span class="cx"> ?>
</span><span class="cx"> jQuery('#embed-code').prepend('<?php echo htmlentities($content); ?>');
</span><span class="cx"> });
</span><ins>+ jQuery('#extra-fields').show();
</ins><span class="cx"> return false;
</span><span class="cx"> break;
</span><span class="cx"> case 'photo' :
</span><del>- jQuery('#extra_fields').before('<p id="waiting"><img src="images/wpspin_light.gif" alt="" /> <?php echo esc_js( __( 'Loading...' ) ); ?></p>');
- jQuery.ajax({
- type: "GET",
- cache : false,
- url: "<?php echo esc_url($_SERVER['PHP_SELF']); ?>",
- data: "ajax=photo_js&u=<?php echo urlencode($url)?>",
- dataType : "script",
- success : function() {
- jQuery('#waiting').remove();
- }
- });
</del><ins>+ function setup_photo_actions() {
+ jQuery('.close').click(function() {
+ jQuery('#extra-fields').hide();
+ jQuery('#extra-fields').html('');
+ });
+ jQuery('.refresh').click(function() {
+ photostorage = false;
+ show('photo');
+ });
+ jQuery('#photo-add-url').attr('href', '?ajax=photo_thickbox_url&height=200&width=500');
+ tb_init('#extra-fields .thickbox');
+ jQuery('#waiting').hide();
+ jQuery('#extra-fields').show();
+ }
+ jQuery('#extra-fields').before('<div id="waiting"><img src="images/wpspin_light.gif" alt="" /> <?php echo esc_js( __( 'Loading...' ) ); ?></div>');
+
+ if(photostorage == false) {
+ jQuery.ajax({
+ type: "GET",
+ cache : false,
+ url: "<?php echo esc_url($_SERVER['PHP_SELF']); ?>",
+ data: "ajax=photo_js&u=<?php echo urlencode($url)?>",
+ dataType : "script",
+ success : function(data) {
+ eval(data);
+ photostorage = jQuery('#extra-fields').html();
+ setup_photo_actions();
+ }
+ });
+ } else {
+ jQuery('#extra-fields').html(photostorage);
+ setup_photo_actions();
+ }
</ins><span class="cx"> return false;
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> jQuery(document).ready(function($) {
</span><span class="cx"> //resize screen
</span><del>- window.resizeTo(720,570);
</del><ins>+ window.resizeTo(720,540);
</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">@@ -449,7 +459,7 @@
</span><span class="cx"> <div id="poststuff" class="metabox-holder">
</span><span class="cx"> <div id="side-info-column">
</span><span class="cx"> <div class="sleeve">
</span><del>- <h1 id="viewsite"><a class="button" href="<?php echo get_option('home'); ?>/" target="_blank"><?php bloginfo('name'); ?> &rsaquo; <?php _e('Press This') ?></a></span></h1>
</del><ins>+ <h1 id="viewsite"><a href="<?php echo get_option('home'); ?>/" target="_blank"><?php bloginfo('name'); ?> &rsaquo; <?php _e('Press This') ?></a></span></h1>
</ins><span class="cx">
</span><span class="cx"> <?php wp_nonce_field('press-this') ?>
</span><span class="cx"> <input type="hidden" name="post_type" id="post_type" value="text"/>
</span><span class="lines">@@ -461,6 +471,9 @@
</span><span class="cx"> <div class="photolist"></div>
</span><span class="cx">
</span><span class="cx"> <div id="submitdiv" class="stuffbox">
</span><ins>+ <div class="handlediv" title="<?php _e( 'Click to toggle' ); ?>">
+ <br/>
+ </div>
</ins><span class="cx"> <h3><?php _e('Publish') ?></h3>
</span><span class="cx"> <div class="inside">
</span><span class="cx"> <p>
</span><span class="lines">@@ -476,10 +489,14 @@
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div id="categorydiv" class="stuffbox">
</span><ins>+ <div class="handlediv" title="<?php _e( 'Click to toggle' ); ?>">
+ <br/>
+ </div>
</ins><span class="cx"> <h3><?php _e('Categories') ?></h3>
</span><span class="cx"> <div class="inside">
</span><span class="cx">
</span><span class="cx"> <div id="categories-all" class="tabs-panel">
</span><ins>+
</ins><span class="cx"> <ul id="categorychecklist" class="list:category categorychecklist form-no-clear">
</span><span class="cx"> <?php wp_category_checklist($post_ID, false) ?>
</span><span class="cx"> </ul>
</span><span class="lines">@@ -499,6 +516,9 @@
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div id="tagsdiv-post_tag" class="stuffbox" >
</span><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">@@ -518,7 +538,6 @@
</span><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx"> </div>
</span><del>-
</del><span class="cx"> <div class="posting">
</span><span class="cx"> <?php if ( isset($posted) && intval($posted) ) { $post_ID = intval($posted); ?>
</span><span class="cx"> <div id="message" class="updated fade"><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>
</span><span class="lines">@@ -530,10 +549,10 @@
</span><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>- <div id="extra_fields" style="display: none"></div>
</del><ins>+ <div id="extra-fields" style="display: none"></div>
</ins><span class="cx">
</span><span class="cx"> <div class="postdivrich">
</span><del>- <ul id="actions">
</del><ins>+ <ul id="actions" class="actions">
</ins><span class="cx">
</span><span class="cx"> <li id="photo_button">
</span><span class="cx"> Add: <?php if ( current_user_can('upload_files') ) { ?><a title="<?php _e('Insert an Image'); ?>" href="#">
</span></span></pre></div>
<a id="trunkwpincludeslinktemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/link-template.php (12093 => 12094)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/link-template.php 2009-10-22 21:06:33 UTC (rev 12093)
+++ trunk/wp-includes/link-template.php 2009-10-23 04:32:56 UTC (rev 12094)
</span><span class="lines">@@ -1716,7 +1716,7 @@
</span><span class="cx"> l=d.location,
</span><span class="cx"> e=encodeURIComponent,
</span><span class="cx"> u=f+'?u='+e(l.href)+'&t='+e(d.title)+'&s='+e(s)+'&v=4';
</span><del>- a=function(){if(!w.open(u,'t','toolbar=0,resizable=0,status=1,width=720,height=570'))l.href=u;};
</del><ins>+ a=function(){if(!w.open(u,'t','toolbar=0,resizable=1,scrollbars=1,status=1,width=720,height=570'))l.href=u;};
</ins><span class="cx"> if (/Firefox/.test(navigator.userAgent)) setTimeout(a, 0); else a();
</span><span class="cx"> void(0)";
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludesscriptloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/script-loader.php (12093 => 12094)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/script-loader.php 2009-10-22 21:06:33 UTC (rev 12093)
+++ trunk/wp-includes/script-loader.php 2009-10-23 04:32:56 UTC (rev 12094)
</span><span class="lines">@@ -438,7 +438,7 @@
</span><span class="cx"> $styles->add( 'dashboard', "/wp-admin/css/dashboard$suffix.css", array(), '20090514' );
</span><span class="cx"> $styles->add( 'install', "/wp-admin/css/install$suffix.css", array(), '20090514' );
</span><span class="cx"> $styles->add( 'theme-editor', "/wp-admin/css/theme-editor$suffix.css", array(), '20090625' );
</span><del>- $styles->add( 'press-this', "/wp-admin/css/press-this$suffix.css", array(), '20091014' );
</del><ins>+ $styles->add( 'press-this', "/wp-admin/css/press-this$suffix.css", array(), '20091022' );
</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(), '20091010' );
</span><span class="cx"> $styles->add( 'plugin-install', "/wp-admin/css/plugin-install$suffix.css", array(), '20090514' );
</span></span></pre>
</div>
</div>
</body>
</html>