Changeset 38504

Timestamp:

09/01/2016 11:59:59 PM (8 years ago)

Author:

pento

Message:

Smilies: Add the smilies filter.

This new filter allows the smilies array to be modified with a filter, instead of having to directly access the global.

Props mte90, jorbin.
Fixes #35905.

Location:

trunk

Files:

• src/wp-includes/functions.php (modified) (1 diff)
• tests/phpunit/tests/formatting/Smilies.php (modified) (1 diff)

trunk/src/wp-includes/functions.php

@@ -3343 +3343 @@
     }
 
+    /**
+     * Filter all the smilies.
+     *
+     * This filter must be added before `smilies_init` is run, as
+     * it is normally only run once to setup the smilies regex.
+     *
+     * @since 4.6.0
+     *
+     * @param array $wpsmiliestrans List of the smilies.
+     */
+    $wpsmiliestrans = apply_filters('smilies', $wpsmiliestrans);
+
     if (count($wpsmiliestrans) == 0) {
         return;

trunk/tests/phpunit/tests/formatting/Smilies.php

@@ -313 +313 @@
         update_option( 'use_smilies', 0 );
     }
+
+    /**
+     * Test to ensure smilies can be removed with a filter
+     *
+     * @ticket 35905
+     */
+    public function test_smilies_filter_removes_smilies() {
+        add_filter( 'smilies', array( $this, '_filter_remove_smilies' ) );
+        smilies_init();
+        remove_filter( 'smilies', array( $this, '_filter_remove_smilies' ) );
+
+        $txt = ':oops: I did it again';
+
+        $this->assertEquals( $txt, convert_smilies( $txt ) );
+    }
+
+    /**
+     * Test to ensure smilies can be added with a filter
+     *
+     * @ticket 35905
+     */
+    public function test_smilies_filter_adds_smilies() {
+        add_filter( 'smilies', array( $this, '_filter_add_smilies' ) );
+        smilies_init();
+        remove_filter( 'smilies', array( $this, '_filter_add_smilies' ) );
+
+        $txt = 'You played with my <3';
+        $expected_txt = 'You played with my \xe2\x9d\xa4';
+
+        $this->assertEquals( $expected_txt, convert_smilies( $txt ) );
+    }
+
+
+     public function _filter_remove_smilies( $wpsmiliestrans ) {
+        unset( $wpsmiliestrans[':oops:'] );
+        return $wpsmiliestrans;
+     }
+
+     public function _filter_add_smilies( $wpsmiliestrans ) {
+        $wpsmiliestrans['<3'] = '\xe2\x9d\xa4';
+        return $wpsmiliestrans;
+     }
 }