Ticket #15454: garyc40-15454-rev2.patch

wp-admin/edit-tag-form.php

@@ -61 +61 @@
 <?php endif; // is_taxonomy_hierarchical() ?>
                 <tr class="form-field">
                         <th scope="row" valign="top"><label for="description"><?php _ex('Description', 'Taxonomy Description'); ?></label></th>
-                        <td><textarea name="description" id="description" rows="5" cols="50" style="width: 97%;"><?php echo esc_textarea( $tag->description ); ?></textarea><br />
+                        <td><textarea name="description" id="description" rows="5" cols="50" style="width: 97%;"><?php echo $tag->description; // already escaped ?></textarea><br />
                         <span class="description"><?php _e('The description is not prominent by default, however some themes may show it.'); ?></span></td>
                 </tr>
                 <?php

wp-admin/includes/media.php

@@ -1343 +1343 @@
                 if ( !empty( $field[ $field['input'] ] ) )
                         $item .= $field[ $field['input'] ];
                 elseif ( $field['input'] == 'textarea' ) {
-                        $item .= "<textarea type='text' id='$name' name='$name' $aria_required>" . esc_textarea( $field['value'] ) . '</textarea>';
+                        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>';
                 } else {
                         $item .= "<input type='text' class='text' id='$name' name='$name' value='" . esc_attr( $field['value'] ) . "' $aria_required />";
                 }

wp-admin/includes/meta-boxes.php

@@ -288 +288 @@
         <div class="jaxtag">
         <div class="nojs-tags hide-if-js">
         <p><?php echo $taxonomy->labels->add_or_remove_items; ?></p>
-        <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>
+        <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>
         <?php if ( current_user_can($taxonomy->cap->assign_terms) ) : ?>
         <div class="ajaxtag hide-if-no-js">
                 <label class="screen-reader-text" for="new-tag-<?php echo $tax_name; ?>"><?php echo $box['title']; ?></label>
@@ -892 +892 @@
         </tr>
         <tr class="form-field">
                 <th valign="top"  scope="row"><label for="link_notes"><?php _e('Notes') ?></label></th>
-                <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>
+                <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>
         </tr>
         <tr class="form-field">
                 <th valign="top"  scope="row"><label for="link_rating"><?php _e('Rating') ?></label></th>

wp-admin/press-this.php

@@ -83 +83 @@
 $selection = '';
 if ( !empty($_GET['s']) ) {
         $selection = str_replace(''', "'", stripslashes($_GET['s']));
-        $selection = trim( htmlspecialchars( html_entity_decode($selection, ENT_QUOTES) ) );
+        $selection = trim( html_entity_decode($selection, ENT_QUOTES) );
 }
 
 if ( ! empty($selection) ) {
@@ -598 +598 @@
                         <div class="editor-container">
                                 <textarea name="content" id="content" style="width:100%;" class="theEditor" rows="15"><?php
                                         if ( $selection )
-                                                echo wp_richedit_pre($selection);
+                                                echo esc_textarea($selection);
                                         if ( $url ) {
                                                 echo '<p>';
                                                 if ( $selection )

wp-includes/bookmark.php

@@ -334 +334 @@
                 return $value;
 
         if ( 'edit' == $context ) {
-                $format_to_edit = array('link_notes');
                 $value = apply_filters("edit_$field", $value, $bookmark_id);
-
-                if ( in_array($field, $format_to_edit) ) {
-                        $value = format_to_edit($value);
-                } else {
-                        $value = esc_attr($value);
-                }
+                $value = esc_attr( $value );
         } else if ( 'db' == $context ) {
                 $value = apply_filters("pre_$field", $value);
         } else {

wp-includes/formatting.php

@@ -1126 +1126 @@
 function format_to_edit($content, $richedit = false) {
         $content = apply_filters('format_to_edit', $content);
         if (! $richedit )
-                $content = htmlspecialchars($content);
+                $content = esc_textarea($content);
         return $content;
 }
 

wp-includes/taxonomy.php

@@ -1520 +1520 @@
         if ( 'edit' == $context ) {
                 $value = apply_filters("edit_term_{$field}", $value, $term_id, $taxonomy);
                 $value = apply_filters("edit_{$taxonomy}_{$field}", $value, $term_id);
-                if ( 'description' == $field )
-                        $value = format_to_edit($value);
-                else
-                        $value = esc_attr($value);
+                $value = esc_attr($value);
         } else if ( 'db' == $context ) {
                 $value = apply_filters("pre_term_{$field}", $value, $taxonomy);
                 $value = apply_filters("pre_{$taxonomy}_{$field}", $value);