
<!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>[12170] branches/2.8/wp-admin/press-this.php: Prevent XSS in press-this.php

 .</title>

</head>

<body>


<div id="msg">

<dl>

<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12170">12170</a></dd>

<dt>Author</dt> <dd>markjaquith</dd>

<dt>Date</dt> <dd>2009-11-12 02:50:13 +0000 (Thu, 12 Nov 2009)</dd>

</dl>


<h3>Log Message</h3>

<pre>Prevent XSS in press-this.php. props Benjamin Flesch. fixes <a href="http://trac.wordpress.org/ticket/11119">#11119</a> for 2.8.x</pre>


<h3>Modified Paths</h3>

<ul>

<li><a href="#branches28wpadminpressthisphp">branches/2.8/wp-admin/press-this.php</a></li>

</ul>


</div>

<div id="patch">

<h3>Diff</h3>

<a id="branches28wpadminpressthisphp"></a>

<div class="modfile"><h4>Modified: branches/2.8/wp-admin/press-this.php (12169 => 12170)</h4>

<pre class="diff"><span>

<span class="info">--- branches/2.8/wp-admin/press-this.php        2009-11-12 02:37:28 UTC (rev 12169)

+++ branches/2.8/wp-admin/press-this.php        2009-11-12 02:50:13 UTC (rev 12170)

</span><span class="lines">@@ -91,8 +91,8 @@

</span><span class="cx"> }

</span><span class="cx"> 

</span><span class="cx"> // Set Variables

</span><del>-$title = isset($_GET['t']) ? esc_html(aposfix(stripslashes($_GET['t']))) : '';

-$selection = isset($_GET['s']) ? trim( aposfix( stripslashes($_GET['s']) ) ) : '';

</del><ins>+$title = isset( $_GET['t'] ) ? trim( strip_tags( aposfix( stripslashes( $_GET['t'] ) ) ) ) : '';

+$selection = isset( $_GET['s'] ) ? trim( htmlspecialchars( html_entity_decode( aposfix( stripslashes( $_GET['s'] ) ) ) ) ) : '';

</ins><span class="cx"> if ( ! empty($selection) ) {

</span><span class="cx">         $selection = preg_replace('/(\r?\n|\r)/', '&lt;/p&gt;&lt;p&gt;', $selection);

</span><span class="cx">         $selection = '&lt;p&gt;'.str_replace('&lt;p&gt;&lt;/p&gt;', '', $selection).'&lt;/p&gt;';

</span><span class="lines">@@ -117,7 +117,7 @@

</span><span class="cx">                 &lt;div class=&quot;postbox&quot;&gt;

</span><span class="cx">                 &lt;h2&gt;&lt;label for=&quot;embed-code&quot;&gt;&lt;?php _e('Embed Code') ?&gt;&lt;/label&gt;&lt;/h2&gt;

</span><span class="cx">                 &lt;div class=&quot;inside&quot;&gt;

</span><del>-                        &lt;textarea name=&quot;embed-code&quot; id=&quot;embed-code&quot; rows=&quot;8&quot; cols=&quot;40&quot;&gt;&lt;?php echo format_to_edit($selection, true); ?&gt;&lt;/textarea&gt;

</del><ins>+                        &lt;textarea name=&quot;embed-code&quot; id=&quot;embed-code&quot; rows=&quot;8&quot; cols=&quot;40&quot;&gt;&lt;?php echo wp_htmledit_pre( $selection ); ?&gt;&lt;/textarea&gt;

</ins><span class="cx">                         &lt;p id=&quot;options&quot;&gt;&lt;a href=&quot;#&quot; class=&quot;select button&quot;&gt;&lt;?php _e('Insert Video'); ?&gt;&lt;/a&gt; &lt;a href=&quot;#&quot; class=&quot;close button&quot;&gt;&lt;?php _e('Cancel'); ?&gt;&lt;/a&gt;&lt;/p&gt;

</span><span class="cx">                 &lt;/div&gt;

</span><span class="cx">                 &lt;/div&gt;

</span><span class="lines">@@ -548,8 +548,8 @@

</span><span class="cx">                         &lt;div id=&quot;quicktags&quot;&gt;&lt;/div&gt;

</span><span class="cx">                         &lt;div class=&quot;editor-container&quot;&gt;

</span><span class="cx">                                 &lt;textarea name=&quot;content&quot; id=&quot;content&quot; style=&quot;width:100%;&quot; class=&quot;mceEditor&quot; rows=&quot;15&quot;&gt;

</span><del>-                                        &lt;?php if ($selection) echo wp_richedit_pre(htmlspecialchars_decode($selection)); ?&gt;

-                                        &lt;?php if ($url) { echo '&lt;p&gt;'; if($selection) _e('via '); echo &quot;&lt;a href='$url'&gt;$title&lt;/a&gt;.&quot;; echo '&lt;/p&gt;'; } ?&gt;

</del><ins>+                                        &lt;?php if ($selection) echo wp_richedit_pre( $selection ); ?&gt;

+                                        &lt;?php if ($url) { echo '&lt;p&gt;'; if($selection) _e('via '); printf( &quot;&lt;a href='%s'&gt;%s&lt;/a&gt;.&quot;, esc_url( $url ), esc_html( $title ) ); echo '&lt;/p&gt;'; } ?&gt;

</ins><span class="cx">                                 &lt;/textarea&gt;

</span><span class="cx">                         &lt;/div&gt;

</span><span class="cx">                 &lt;/div&gt;

</span></span></pre>

</div>

</div>


</body>

</html>