Ticket #2317: 2317.patch

includes/common/template-tags.php

@@ -1686 +1686 @@
                         'dfw'               => false
                 ), 'get_the_content' );
 
+                // If using tinymce, remove our escaping and trust tinymce
+                if ( true === $r['tinymce'] ) {
+                        remove_filter( 'bbp_get_form_forum_content', 'esc_textarea' );
+                        remove_filter( 'bbp_get_form_topic_content', 'esc_textarea' );
+                        remove_filter( 'bbp_get_form_reply_content', 'esc_textarea' );
+                }
+
                 // Assume we are not editing
                 $post_content = call_user_func( 'bbp_get_form_' . $r['context'] . '_content' );
 

includes/core/filters.php

@@ -157 +157 @@
 add_filter( 'bbp_get_topic_content', 'bbp_rel_nofollow',   50   );
 
 // Form textarea output - undo the code-trick done pre-save, and sanitize
-add_filter( 'bbp_get_form_reply_content', 'bbp_code_trick_reverse' );
-add_filter( 'bbp_get_form_reply_content', 'esc_html'               );
-add_filter( 'bbp_get_form_reply_content', 'trim'                   );
+add_filter( 'bbp_get_form_forum_content', 'bbp_code_trick_reverse' );
+add_filter( 'bbp_get_form_forum_content', 'esc_textarea'           );
+add_filter( 'bbp_get_form_forum_content', 'trim'                   );
 add_filter( 'bbp_get_form_topic_content', 'bbp_code_trick_reverse' );
-add_filter( 'bbp_get_form_topic_content', 'esc_html'               );
+add_filter( 'bbp_get_form_topic_content', 'esc_textarea'           );
 add_filter( 'bbp_get_form_topic_content', 'trim'                   );
+add_filter( 'bbp_get_form_reply_content', 'bbp_code_trick_reverse' );
+add_filter( 'bbp_get_form_reply_content', 'esc_textarea'           );
+add_filter( 'bbp_get_form_reply_content', 'trim'                   );
 
 // Add number format filter to functions requiring numeric output
 add_filter( 'bbp_get_user_topic_count',     'bbp_number_format', 10 );

includes/forums/template-tags.php

@@ -1991 +1991 @@
                         $forum_content = '';
                 }
 
-                return apply_filters( 'bbp_get_form_forum_content', esc_textarea( $forum_content ) );
+                return apply_filters( 'bbp_get_form_forum_content', $forum_content );
         }
 
 /**