Changeset 31791

Timestamp:

03/16/2015 10:45:29 AM (10 years ago)

Author:

pento

Message:

Emoji: Rename the email and feed filter functions to be _ prefixed, and @ignore-d in the PHPDocs.

See #31242

Location:

trunk/src/wp-includes

Files:

• default-filters.php (modified) (1 diff)
• feed.php (modified) (1 diff)
• formatting.php (modified) (2 diffs)

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

@@ -157 +157 @@
 
 // RSS filters
-add_filter( 'the_title_rss',      'strip_tags'      );
-add_filter( 'the_title_rss',      'ent2ncr',      8 );
-add_filter( 'the_title_rss',      'esc_html'        );
-add_filter( 'the_content_rss',    'ent2ncr',      8 );
-add_filter( 'the_content_feed',   'feed_emoji'      );
-add_filter( 'the_excerpt_rss',    'convert_chars'   );
-add_filter( 'the_excerpt_rss',    'ent2ncr',      8 );
-add_filter( 'comment_author_rss', 'ent2ncr',      8 );
-add_filter( 'comment_text_rss',   'ent2ncr',      8 );
-add_filter( 'comment_text_rss',   'esc_html'        );
-add_filter( 'comment_text_rss',   'feed_emoji'      );
-add_filter( 'bloginfo_rss',       'ent2ncr',      8 );
-add_filter( 'the_author',         'ent2ncr',      8 );
-add_filter( 'the_guid',           'esc_url'         );
+add_filter( 'the_title_rss',      'strip_tags'                    );
+add_filter( 'the_title_rss',      'ent2ncr',                    8 );
+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_excerpt_rss',    'convert_chars'                 );
+add_filter( 'the_excerpt_rss',    'ent2ncr',                    8 );
+add_filter( 'comment_author_rss', 'ent2ncr',                    8 );
+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( 'bloginfo_rss',       'ent2ncr',                    8 );
+add_filter( 'the_author',         'ent2ncr',                    8 );
+add_filter( 'the_guid',           'esc_url'                       );
 
 // Email filters
-add_filter( 'wp_mail', 'mail_emoji' );
+add_filter( 'wp_mail', '_wp_staticize_emoji_for_email' );
 
 // Misc filters

trunk/src/wp-includes/feed.php

@@ -654 +654 @@
  * Convert emoji characters in a feed into static images.
  *
+ * @ignore
+ * @since 4.2.0
+ *
  * @param string $content The content to convert.
- *
  * @return The converted content.
  */
-function feed_emoji( $content ) {
+function _wp_staticize_emoji_for_feeds( $content ) {
     return wp_staticize_emoji( $content, true );
 }

trunk/src/wp-includes/formatting.php

@@ -4193 +4193 @@
  * Convert emoji in emails into static images.
  *
+ * @ignore
  * @since 4.2.0
  *
@@ -4198 +4199 @@
  * @return array The email data array, with emoji in the message staticized.
  */
-function mail_emoji( $mail ) {
+function _wp_staticize_emoji_for_email( $mail ) {
     $mail['message'] = wp_staticize_emoji( $mail['message'], true );
     return $mail;