<!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>[12592] trunk/wp-admin/press-this.php: Fix Press This entity encoding,
props noel, fixes #11390</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12592">12592</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2009-12-31 04:57:54 +0000 (Thu, 31 Dec 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix Press This entity encoding, props noel, fixes <a href="http://trac.wordpress.org/ticket/11390">#11390</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminpressthisphp">trunk/wp-admin/press-this.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminpressthisphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/press-this.php (12591 => 12592)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/press-this.php 2009-12-31 02:37:56 UTC (rev 12591)
+++ trunk/wp-admin/press-this.php 2009-12-31 04:57:54 UTC (rev 12592)
</span><span class="lines">@@ -14,23 +14,6 @@
</span><span class="cx"> wp_die( __( 'Cheatin&#8217; uh?' ) );
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Convert characters.
- *
- * @package WordPress
- * @subpackage Press_This
- * @since 2.6.0
- *
- * @param string $text
- * @return string
- */
-function aposfix($text) {
- $translation_table[chr(34)] = '&quot;';
- $translation_table[chr(38)] = '&';
- $translation_table[chr(39)] = '&apos;';
- return preg_replace("/&(?![A-Za-z]{0,4}\w{2,3};|#[0-9]{2,3};)/","&amp;" , strtr($text, $translation_table));
-}
-
-/**
</del><span class="cx"> * Press It form handler.
</span><span class="cx"> *
</span><span class="cx"> * @package WordPress
</span><span class="lines">@@ -92,11 +75,17 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Set Variables
</span><del>-$title = isset( $_GET['t'] ) ? trim( strip_tags( aposfix( stripslashes( $_GET['t'] ) ) ) ) : '';
-$selection = isset( $_GET['s'] ) ? trim( htmlspecialchars( html_entity_decode( aposfix( stripslashes( $_GET['s'] ) ) ) ) ) : '';
</del><ins>+$title = isset( $_GET['t'] ) ? trim( strip_tags( html_entity_decode( stripslashes( $_GET['t'] ) , ENT_QUOTES) ) ) : '';
+
+$selection = '';
+if ( !empty($_GET['s']) ) {
+ $selection = str_replace('&apos;', "'", stripslashes($_GET['s']));
+ $selection = trim( htmlspecialchars( html_entity_decode($selection, ENT_QUOTES) ) );
+}
+
</ins><span class="cx"> if ( ! empty($selection) ) {
</span><span class="cx"> $selection = preg_replace('/(\r?\n|\r)/', '</p><p>', $selection);
</span><del>- $selection = '<p>'.str_replace('<p></p>', '', $selection).'</p>';
</del><ins>+ $selection = '<p>' . str_replace('<p></p>', '', $selection) . '</p>';
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $url = isset($_GET['u']) ? esc_url($_GET['u']) : '';
</span></span></pre>
</div>
</div>
</body>
</html>