diff --git a/wp-includes/formatting.php b/wp-includes/formatting.php index fd01b551bb..824552e380 100644 --- a/wp-includes/formatting.php +++ b/wp-includes/formatting.php @@ -5192,15 +5192,25 @@ function wp_staticize_emoji( $text ) { * @since 4.8.1 * @access private * + * @see wp_staticize_emoji() + * @staticvar string $cdn_url The CDN url returned by the {@see 'emoji_url'} filter. + * @staticvar string $ext The file extension returned by the {@see 'emoji_ext'} filter. + * * @param array $matches The matched data. * @return string HTML for the static emoji image. */ function _wp_staticize_emoji( $matches ) { - /** This filter is documented in wp-includes/formatting.php */ - $cdn_url = apply_filters( 'emoji_url', 'https://s.w.org/images/core/emoji/2.3/72x72/' ); + static $cdn_url; + if ( ! $cdn_url ) { + /** This filter is documented in wp-includes/formatting.php */ + $cdn_url = apply_filters( 'emoji_url', 'https://s.w.org/images/core/emoji/2.3/72x72/' ); + } - /** This filter is documented in wp-includes/formatting.php */ - $ext = apply_filters( 'emoji_ext', '.png' ); + static $ext; + if ( ! $ext ) { + /** This filter is documented in wp-includes/formatting.php */ + $ext = apply_filters( 'emoji_ext', '.png' ); + } $char = str_replace( ';&#x', '-', $matches[1] ); $char = str_replace( array( '&#x', ';'), '', $char ); diff --git a/wp-includes/version.php b/wp-includes/version.php index c5f945efe4..c268353105 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.9-alpha-41045'; +$wp_version = '4.9-alpha-41046'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.