<!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>[17001] trunk: Remove some unnecessary esc_textarea() calls.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/17001">17001</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-12-16 17:48:20 +0000 (Thu, 16 Dec 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove some unnecessary esc_textarea() calls. Props garyc40. see <a href="http://trac.wordpress.org/ticket/15454">#15454</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminedittagformphp">trunk/wp-admin/edit-tag-form.php</a></li>
<li><a href="#trunkwpadminincludesmediaphp">trunk/wp-admin/includes/media.php</a></li>
<li><a href="#trunkwpadminincludesmetaboxesphp">trunk/wp-admin/includes/meta-boxes.php</a></li>
<li><a href="#trunkwpincludesformattingphp">trunk/wp-includes/formatting.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminedittagformphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit-tag-form.php (17000 => 17001)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit-tag-form.php 2010-12-16 17:23:54 UTC (rev 17000)
+++ trunk/wp-admin/edit-tag-form.php 2010-12-16 17:48:20 UTC (rev 17001)
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx"> <?php endif; // is_taxonomy_hierarchical() ?>
</span><span class="cx"> <tr class="form-field">
</span><span class="cx"> <th scope="row" valign="top"><label for="description"><?php _ex('Description', 'Taxonomy Description'); ?></label></th>
</span><del>- <td><textarea name="description" id="description" rows="5" cols="50" style="width: 97%;"><?php echo esc_textarea( $tag->description ); ?></textarea><br />
</del><ins>+ <td><textarea name="description" id="description" rows="5" cols="50" style="width: 97%;"><?php echo $tag->description; // already escaped ?></textarea><br />
</ins><span class="cx"> <span class="description"><?php _e('The description is not prominent by default, however some themes may show it.'); ?></span></td>
</span><span class="cx"> </tr>
</span><span class="cx"> <?php
</span></span></pre></div>
<a id="trunkwpadminincludesmediaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/media.php (17000 => 17001)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/media.php 2010-12-16 17:23:54 UTC (rev 17000)
+++ trunk/wp-admin/includes/media.php 2010-12-16 17:48:20 UTC (rev 17001)
</span><span class="lines">@@ -1343,7 +1343,10 @@
</span><span class="cx"> if ( !empty( $field[ $field['input'] ] ) )
</span><span class="cx"> $item .= $field[ $field['input'] ];
</span><span class="cx"> elseif ( $field['input'] == 'textarea' ) {
</span><del>- $item .= "<textarea type='text' id='$name' name='$name' $aria_required>" . esc_textarea( $field['value'] ) . '</textarea>';
</del><ins>+ if ( user_can_richedit() ) { // already escaped when user_can_richedit() = false
+ $field['value'] = esc_textarea( $field['value'] );
+ }
+ $item .= "<textarea type='text' id='$name' name='$name' $aria_required>" . $field['value'] . '</textarea>';
</ins><span class="cx"> } else {
</span><span class="cx"> $item .= "<input type='text' class='text' id='$name' name='$name' value='" . esc_attr( $field['value'] ) . "' $aria_required />";
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpadminincludesmetaboxesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/meta-boxes.php (17000 => 17001)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/meta-boxes.php 2010-12-16 17:23:54 UTC (rev 17000)
+++ trunk/wp-admin/includes/meta-boxes.php 2010-12-16 17:48:20 UTC (rev 17001)
</span><span class="lines">@@ -288,7 +288,7 @@
</span><span class="cx"> <div class="jaxtag">
</span><span class="cx"> <div class="nojs-tags hide-if-js">
</span><span class="cx"> <p><?php echo $taxonomy->labels->add_or_remove_items; ?></p>
</span><del>- <textarea name="<?php echo "tax_input[$tax_name]"; ?>" rows="3" cols="20" class="the-tags" id="tax-input-<?php echo $tax_name; ?>" <?php echo $disabled; ?>><?php echo esc_textarea( get_terms_to_edit( $post->ID, $tax_name ) ); ?></textarea></div>
</del><ins>+ <textarea name="<?php echo "tax_input[$tax_name]"; ?>" rows="3" cols="20" class="the-tags" id="tax-input-<?php echo $tax_name; ?>" <?php echo $disabled; ?>><?php echo get_terms_to_edit( $post->ID, $tax_name ); // escaped by esc_attr() ?></textarea></div>
</ins><span class="cx"> <?php if ( current_user_can($taxonomy->cap->assign_terms) ) : ?>
</span><span class="cx"> <div class="ajaxtag hide-if-no-js">
</span><span class="cx"> <label class="screen-reader-text" for="new-tag-<?php echo $tax_name; ?>"><?php echo $box['title']; ?></label>
</span><span class="lines">@@ -892,7 +892,7 @@
</span><span class="cx"> </tr>
</span><span class="cx"> <tr class="form-field">
</span><span class="cx"> <th valign="top" scope="row"><label for="link_notes"><?php _e('Notes') ?></label></th>
</span><del>- <td><textarea name="link_notes" id="link_notes" cols="50" rows="10" style="width: 95%"><?php echo esc_textarea( ( isset( $link->link_notes ) ? $link->link_notes : '') ); ?></textarea></td>
</del><ins>+ <td><textarea name="link_notes" id="link_notes" cols="50" rows="10" style="width: 95%"><?php echo ( isset( $link->link_notes ) ? $link->link_notes : ''); // escaped ?></textarea></td>
</ins><span class="cx"> </tr>
</span><span class="cx"> <tr class="form-field">
</span><span class="cx"> <th valign="top" scope="row"><label for="link_rating"><?php _e('Rating') ?></label></th>
</span></span></pre></div>
<a id="trunkwpincludesformattingphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/formatting.php (17000 => 17001)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/formatting.php 2010-12-16 17:23:54 UTC (rev 17000)
+++ trunk/wp-includes/formatting.php 2010-12-16 17:48:20 UTC (rev 17001)
</span><span class="lines">@@ -1126,7 +1126,7 @@
</span><span class="cx"> function format_to_edit($content, $richedit = false) {
</span><span class="cx"> $content = apply_filters('format_to_edit', $content);
</span><span class="cx"> if (! $richedit )
</span><del>- $content = htmlspecialchars($content);
</del><ins>+ $content = esc_textarea($content);
</ins><span class="cx"> return $content;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>