WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert [16995] due to the way the data enters the db. props garyc40, see #15454. 

git-svn-id: http://svn.automattic.com/wordpress/trunk@17142 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
nacin 2010-12-25 18:10:59 +00:00
parent 9009245db5
commit 95726df854
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
wp-includes/formatting.php
View File

@ -1114,8 +1114,8 @@ function force_balance_tags( $text ) {
* Acts on text which is about to be edited.
*
* Unless $richedit is set, it is simply a holder for the 'format_to_edit'
* filter. If $richedit is set true htmlspecialchars() will be run on the
* content, converting special characters to HTMl entities.
* filter. If $richedit is set true htmlspecialchars(), through esc_textarea(),
* will be run on the content, converting special characters to HTML entities.
*
* @since 0.71
*
@ -1123,10 +1123,10 @@ function force_balance_tags( $text ) {
* @param bool $richedit Whether the $content should pass through htmlspecialchars(). Default false.
* @return string The text after the filter (and possibly htmlspecialchars()) has been run.
*/
function format_to_edit($content, $richedit = false) {
$content = apply_filters('format_to_edit', $content);
if (! $richedit )
$content = esc_textarea($content);
function format_to_edit( $content, $richedit = false ) {
$content = apply_filters( 'format_to_edit', $content );
if ( ! $richedit )
$content = esc_textarea( $content );
return $content;
}

2
wp-includes/user.php
View File

@ -1202,7 +1202,7 @@ function sanitize_user_field($field, $value, $user_id, $context) {
}
if ( 'description' == $field )
$value = esc_textarea( $value );
$value = esc_html( $value ); // textarea_escaped?
else
$value = esc_attr($value);
} else if ( 'db' == $context ) {