WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

See #31242


Built from https://develop.svn.wordpress.org/trunk@31791


git-svn-id: http://core.svn.wordpress.org/trunk@31773 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Gary Pendergast 2015-03-16 10:46:26 +00:00
parent 756e445a53
commit a97462e755
4 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
wp-includes/default-filters.php
View File

@ -156,23 +156,23 @@ add_filter( 'list_cats', 'wptexturize' );
add_filter( 'wp_sprintf', 'wp_sprintf_l', 10, 2 );
// 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
add_filter( 'option_ping_sites', 'privacy_ping_filter' );

6
wp-includes/feed.php
View File

@ -653,10 +653,12 @@ function fetch_feed( $url ) {
/**
* Convert emoji characters in a feed into static images.
*
* @param string $content The content to convert.
* @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 );
}

3
wp-includes/formatting.php
View File

@ -4192,12 +4192,13 @@ function wp_staticize_emoji( $text ) {
/**
* Convert emoji in emails into static images.
*
* @ignore
* @since 4.2.0
*
* @param array $mail The email data array.
* @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;
}

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.2-beta1-31790';
$wp_version = '4.2-beta1-31791';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.