Changeset 32161 for trunk/src/wp-includes/default-filters.php

Timestamp:

04/20/2015 04:14:32 AM (9 years ago)

Author:

nacin

Message:

Clean up wp_staticize_emoji() and friends.

• DOMDocument was removed in [31752] but not the check.
• wp_staticize_emoji() has never accepted a second arg; remove it from calls.
• Remove wp_staticize_emoji_for_feeds(), no need for it.
• Remove _ and @ignore from wp_staticize_emoji_for_email(), no need for it.

see #31242.

File:

• trunk/src/wp-includes/default-filters.php (modified) (3 diffs)

trunk/src/wp-includes/default-filters.php

@@ -161 +161 @@
 add_filter( 'the_title_rss',      'esc_html'                      );
 add_filter( 'the_content_rss',    'ent2ncr',                    8 );
-add_filter( 'the_content_feed',   '_wp_staticize_emoji_for_feeds' );
+add_filter( 'the_content_feed',   'wp_staticize_emoji'            );
 add_filter( 'the_excerpt_rss',    'convert_chars'                 );
 add_filter( 'the_excerpt_rss',    'ent2ncr',                    8 );
@@ -167 +167 @@
 add_filter( 'comment_text_rss',   'ent2ncr',                    8 );
 add_filter( 'comment_text_rss',   'esc_html'                      );
-add_filter( 'comment_text_rss',   '_wp_staticize_emoji_for_feeds' );
+add_filter( 'comment_text_rss',   'wp_staticize_emoji'            );
 add_filter( 'bloginfo_rss',       'ent2ncr',                    8 );
 add_filter( 'the_author',         'ent2ncr',                    8 );
@@ -173 +173 @@
 
 // Email filters
-add_filter( 'wp_mail', '_wp_staticize_emoji_for_email' );
+add_filter( 'wp_mail', 'wp_staticize_emoji_for_email' );
 
 // Misc filters