Ticket #6529: 6529.02.patch

src/bp-activity/bp-activity-filters.php

@@ -33 +33 @@
 add_filter( 'bp_activity_content_before_save',       'force_balance_tags' );
 add_filter( 'bp_activity_action_before_save',        'force_balance_tags' );
 
+if ( bp_get_major_wp_version() >= 4.2 ) {
+        add_filter( 'bp_activity_content_before_save', 'wp_encode_emoji' );
+}
+
 add_filter( 'bp_get_activity_action',                'wptexturize' );
 add_filter( 'bp_get_activity_content_body',          'wptexturize' );
 add_filter( 'bp_get_activity_content',               'wptexturize' );

src/bp-groups/bp-groups-filters.php

@@ -54 +54 @@
 add_filter( 'groups_group_name_before_save',        'trim' );
 add_filter( 'groups_group_description_before_save', 'trim' );
 
+if ( bp_get_major_wp_version() >= 4.2 ) {
+        add_filter( 'groups_group_description_before_save', 'wp_encode_emoji' );
+}
+
 // Escape output of new group creation details.
 add_filter( 'bp_get_new_group_id',          'esc_attr'     );
 add_filter( 'bp_get_new_group_name',        'esc_attr'     );

src/bp-messages/bp-messages-filters.php

@@ -33 +33 @@
 add_filter( 'messages_notice_message_before_save',  'force_balance_tags' );
 add_filter( 'messages_notice_subject_before_save',  'force_balance_tags' );
 
+if ( bp_get_major_wp_version() >= 4.2 ) {
+        add_filter( 'messages_message_subject_before_save', 'wp_encode_emoji' );
+        add_filter( 'messages_message_content_before_save', 'wp_encode_emoji' );
+        add_filter( 'messages_notice_message_before_save',  'wp_encode_emoji' );
+        add_filter( 'messages_notice_subject_before_save',  'wp_encode_emoji' );
+}
+
 add_filter( 'bp_get_message_notice_subject',     'wptexturize' );
 add_filter( 'bp_get_message_notice_text',        'wptexturize' );
 add_filter( 'bp_get_message_thread_subject',     'wptexturize' );