From c626339cca8070aa537a200b4658392f36409d98 Mon Sep 17 00:00:00 2001 From: ryan Date: Sat, 25 Dec 2010 22:45:09 +0000 Subject: [PATCH] link_notes and term_description escaping fixes. Props garyc40. fixes #15454 git-svn-id: http://svn.automattic.com/wordpress/trunk@17146 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/bookmark.php | 5 ++--- wp-includes/taxonomy.php | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/wp-includes/bookmark.php b/wp-includes/bookmark.php index ddb5e1374..8b0fe4874 100644 --- a/wp-includes/bookmark.php +++ b/wp-includes/bookmark.php @@ -334,11 +334,10 @@ function sanitize_bookmark_field($field, $value, $bookmark_id, $context) { 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); + if ( 'link_notes' == $field ) { + $value = esc_html( $value ); // textarea_escaped } else { $value = esc_attr($value); } diff --git a/wp-includes/taxonomy.php b/wp-includes/taxonomy.php index 32f77e413..8dbf8aab5 100644 --- a/wp-includes/taxonomy.php +++ b/wp-includes/taxonomy.php @@ -1521,7 +1521,7 @@ function sanitize_term_field($field, $value, $term_id, $taxonomy, $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); + $value = esc_html($value); // textarea_escaped else $value = esc_attr($value); } else if ( 'db' == $context ) {