<!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>[17142] trunk/wp-includes: Revert [16995]
due to the way the data enters the db.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/17142">17142</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-12-25 18:10:59 +0000 (Sat, 25 Dec 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Revert <a href="http://trac.wordpress.org/changeset/16995">[16995]</a> due to the way the data enters the db. props garyc40, see <a href="http://trac.wordpress.org/ticket/15454">#15454</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesformattingphp">trunk/wp-includes/formatting.php</a></li>
<li><a href="#trunkwpincludesuserphp">trunk/wp-includes/user.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesformattingphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/formatting.php (17141 => 17142)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/formatting.php 2010-12-25 17:58:01 UTC (rev 17141)
+++ trunk/wp-includes/formatting.php 2010-12-25 18:10:59 UTC (rev 17142)
</span><span class="lines">@@ -1114,8 +1114,8 @@
</span><span class="cx"> * Acts on text which is about to be edited.
</span><span class="cx"> *
</span><span class="cx"> * Unless $richedit is set, it is simply a holder for the 'format_to_edit'
</span><del>- * filter. If $richedit is set true htmlspecialchars() will be run on the
- * content, converting special characters to HTMl entities.
</del><ins>+ * filter. If $richedit is set true htmlspecialchars(), through esc_textarea(),
+ * will be run on the content, converting special characters to HTML entities.
</ins><span class="cx"> *
</span><span class="cx"> * @since 0.71
</span><span class="cx"> *
</span><span class="lines">@@ -1123,10 +1123,10 @@
</span><span class="cx"> * @param bool $richedit Whether the $content should pass through htmlspecialchars(). Default false.
</span><span class="cx"> * @return string The text after the filter (and possibly htmlspecialchars()) has been run.
</span><span class="cx"> */
</span><del>-function format_to_edit($content, $richedit = false) {
- $content = apply_filters('format_to_edit', $content);
- if (! $richedit )
- $content = esc_textarea($content);
</del><ins>+function format_to_edit( $content, $richedit = false ) {
+ $content = apply_filters( 'format_to_edit', $content );
+ if ( ! $richedit )
+ $content = esc_textarea( $content );
</ins><span class="cx"> return $content;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludesuserphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/user.php (17141 => 17142)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/user.php 2010-12-25 17:58:01 UTC (rev 17141)
+++ trunk/wp-includes/user.php 2010-12-25 18:10:59 UTC (rev 17142)
</span><span class="lines">@@ -1202,7 +1202,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( 'description' == $field )
</span><del>- $value = esc_textarea( $value );
</del><ins>+ $value = esc_html( $value ); // textarea_escaped?
</ins><span class="cx"> else
</span><span class="cx"> $value = esc_attr($value);
</span><span class="cx"> } else if ( 'db' == $context ) {
</span></span></pre>
</div>
</div>
</body>
</html>