Changeset 6614

Timestamp:

07/04/2017 04:09:35 PM (7 years ago)

Author:

johnjamesjacoby

Message:

Subscriptions: Use bbp_remove_all_filters() with restore option.

This change uses the bbPress version of remove_all_filters() which allows those filters to be restored. We need to restore filters after emails are sent so that template titles & content render correctly within their respective templates.

See #6613.

File:

• trunk/src/includes/common/functions.php (modified) (4 diffs)

trunk/src/includes/common/functions.php

@@ -1081 +1081 @@
     // Remove filters from reply content and topic title to prevent content
     // from being encoded with HTML entities, wrapped in paragraph tags, etc...
-    remove_all_filters( 'bbp_get_reply_content' );
-    remove_all_filters( 'bbp_get_topic_title'   );
-    remove_all_filters( 'the_title'             );
+    bbp_remove_all_filters( 'bbp_get_reply_content' );
+    bbp_remove_all_filters( 'bbp_get_topic_title'   );
+    bbp_remove_all_filters( 'the_title'             );
 
     // Strip tags from text and setup mail data
@@ -1148 +1148 @@
 
     do_action( 'bbp_post_notify_subscribers', $reply_id, $topic_id, $user_ids );
+
+    // Restore previously removed filters
+    bbp_restore_all_filters( 'bbp_get_topic_content' );
+    bbp_restore_all_filters( 'bbp_get_topic_title'   );
+    bbp_restore_all_filters( 'the_title'             );
 
     return true;
@@ -1229 +1234 @@
     // Remove filters from reply content and topic title to prevent content
     // from being encoded with HTML entities, wrapped in paragraph tags, etc...
-    remove_all_filters( 'bbp_get_topic_content' );
-    remove_all_filters( 'bbp_get_topic_title'   );
-    remove_all_filters( 'the_title'             );
+    bbp_remove_all_filters( 'bbp_get_topic_content' );
+    bbp_remove_all_filters( 'bbp_get_topic_title'   );
+    bbp_remove_all_filters( 'the_title'             );
 
     // Strip tags from text and setup mail data
@@ -1296 +1301 @@
 
     do_action( 'bbp_post_notify_forum_subscribers', $topic_id, $forum_id, $user_ids );
+
+    // Restore previously removed filters
+    bbp_restore_all_filters( 'bbp_get_topic_content' );
+    bbp_restore_all_filters( 'bbp_get_topic_title'   );
+    bbp_restore_all_filters( 'the_title'             );
 
     return true;