Ticket #30130: 30130.2.diff

wp-includes/default-filters.php

@@ -91 +91 @@
         add_filter( $filter, 'balanceTags', 50 );
 }
 
+// Normalize to NFC
+foreach ( array( 'sanitize_email', 'sanitize_file_name', 'sanitize_html_class', 'sanitize_key', 'sanitize_meta', 'sanitize_mime_type', 'sanitize_option', 'sanitize_sql_orderby', 'sanitize_text_field', 'sanitize_title', 'sanitize_title_for_query', 'sanitize_title_with_dashes', 'sanitize_user', 'content_save_pre', 'excerpt_save_pre', 'comment_save_pre', 'title_save_pre' ) as $filter ) {
+        add_filter( $filter, 'normalize_to_nfc' );
+}
+
 // Format strings for display.
 foreach ( array( 'comment_author', 'term_name', 'link_name', 'link_description', 'link_notes', 'bloginfo', 'wp_title', 'widget_title' ) as $filter ) {
         add_filter( $filter, 'wptexturize'   );
@@ -262 +267 @@
 add_action( 'atom_head', 'atom_site_icon' );
 add_action( 'rss2_head', 'rss2_site_icon' );
 
-
 // WP Cron
 if ( !defined( 'DOING_CRON' ) )
         add_action( 'init', 'wp_cron' );

wp-includes/formatting.php

@@ -4793 +4793 @@
         }
         return $short_url;
 }
+
+/**
+ * Normalize text, if necessary and possible
+ * See: http://www.w3.org/International/docs/charmod-norm/#choice-of-normalization-form
+ *
+ * @since 4.6.0
+ *
+ * @param string $content Content to normalize
+ * @return string
+*/
+function normalize_to_nfc( $content ) {
+        if ( function_exists( 'normalizer_normalize' ) ) {
+                if ( ! normalizer_is_normalized( $content, Normalizer::FORM_C ) ) {
+                        $content = normalizer_normalize( $content, Normalizer::FORM_C );
+                }
+        }
+        return $content;
+}
+ No newline at end of file