Changeset 32161 for trunk/src/wp-includes/formatting.php

Timestamp:

04/20/2015 04:14:32 AM (10 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/formatting.php (modified) (4 diffs)

trunk/src/wp-includes/formatting.php

@@ -4237 +4237 @@
     $text = wp_encode_emoji( $text );
 
-    if ( ! class_exists( 'DOMDocument' ) ) {
-        return $text;
-    }
-
     /** This filter is documented in wp-includes/formatting.php */
     $cdn_url = apply_filters( 'emoji_url', set_url_scheme( '//s.w.org/images/core/emoji/72x72/' ) );
@@ -4315 +4311 @@
  * Convert emoji in emails into static images.
  *
- * @ignore
  * @since 4.2.0
  *
@@ -4321 +4316 @@
  * @return array The email data array, with emoji in the message staticized.
  */
-function _wp_staticize_emoji_for_email( $mail ) {
+function wp_staticize_emoji_for_email( $mail ) {
     if ( ! isset( $mail['message'] ) ) {
         return $mail;
@@ -4374 +4369 @@
 
     if ( 'text/html' === $content_type ) {
-        $mail['message'] = wp_staticize_emoji( $mail['message'], true );
+        $mail['message'] = wp_staticize_emoji( $mail['message'] );
     }