Ticket #23688: htmlspecialchars-with-charset.diff

wp-includes/formatting.php

@@ -2496 +2496 @@
 
         $output = convert_chars($text);
         $output = wpautop($output);
-        $output = htmlspecialchars($output, ENT_NOQUOTES);
+        $output = htmlspecialchars($output, ENT_NOQUOTES, get_option( 'blog_charset' ) );
 
         return apply_filters('richedit_pre', $output);
 }
@@ -2514 +2514 @@
  */
 function wp_htmledit_pre($output) {
         if ( !empty($output) )
-                $output = htmlspecialchars($output, ENT_NOQUOTES); // convert only < > &
+                $output = htmlspecialchars($output, ENT_NOQUOTES, get_option( 'blog_charset' ) ); // convert only < > &
 
         return apply_filters('htmledit_pre', $output);
 }
@@ -2702 +2702 @@
  * @return string
  */
 function esc_textarea( $text ) {
-        $safe_text = htmlspecialchars( $text, ENT_QUOTES );
+        $safe_text = htmlspecialchars( $text, ENT_QUOTES, get_option( 'blog_charset' ) );
         return apply_filters( 'esc_textarea', $safe_text, $text );
 }