Changeset 17142

Timestamp:

12/25/2010 06:10:59 PM (15 years ago)

Author:

nacin

Message:

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

Location:

trunk/wp-includes

Files:

• formatting.php (modified) (2 diffs)
• user.php (modified) (1 diff)

trunk/wp-includes/formatting.php

@@ -1115 +1115 @@
  *
  * 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
@@ -1124 +1124 @@
  * @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;
 }

trunk/wp-includes/user.php

@@ -1203 +1203 @@
 
         if ( 'description' == $field )
-            $value = esc_textarea( $value );
+            $value = esc_html( $value ); // textarea_escaped?
         else
             $value = esc_attr($value);