Changeset 4640

Timestamp:

12/23/2012 01:44:46 AM (13 years ago)

Author:

johnjamesjacoby

Message:

Improve the output of code between pre and code HTML tags. Fixes #1967.

Location:

trunk/includes

Files:

• common/kses.php (modified) (1 diff)
• core/filters.php (modified) (2 diffs)

trunk/includes/common/kses.php

@@ -89 +89 @@
     return wp_kses( $data , bbp_kses_allowed_tags() );
 }
+
+/** Formatting ****************************************************************/
+
+/**
+ * Filter the content of topics and replies, and turn the value of pre and code
+ * tags into entities where appropriate.
+ *
+ * @since bbPress (r4639)
+ *
+ * @param string $content
+ * @return string
+ */
+function bbp_pre_code_tags( $content = '' ) {
+    return preg_replace_callback( '/<pre.*?>(.*?)<\/pre>/imsu', '_bbp_pre_entities_callback', $content );
+}
+
+/**
+ * Callback used by bbp_pre_code_tags()
+ *
+ * @since bbPress (r4639)
+ *
+ * @internal Used by bbp_improve_pre_code_tags() to make code into entities
+ *
+ * @param string $matches
+ * @return string
+ */
+function _bbp_pre_entities_callback( $matches = array() ) {
+    return str_replace( $matches[1], htmlentities( $matches[1] ), $matches[0] );
+}

trunk/includes/core/filters.php

@@ -125 +125 @@
 add_filter( 'bbp_get_reply_content', 'make_clickable',     9    );
 add_filter( 'bbp_get_reply_content', 'capital_P_dangit',   10   );
+add_filter( 'bbp_get_reply_content', 'convert_smilies',    20   );
+add_filter( 'bbp_get_reply_content', 'bbp_pre_code_tags',  25   );
 add_filter( 'bbp_get_reply_content', 'force_balance_tags', 25   );
-add_filter( 'bbp_get_reply_content', 'convert_smilies',    20   );
 add_filter( 'bbp_get_reply_content', 'wpautop',            30   );
 add_filter( 'bbp_get_reply_content', 'bbp_mention_filter', 40   );
@@ -135 +136 @@
 add_filter( 'bbp_get_topic_content', 'make_clickable',     9    );
 add_filter( 'bbp_get_topic_content', 'capital_P_dangit',   10   );
+add_filter( 'bbp_get_topic_content', 'convert_smilies',    20   );
+add_filter( 'bbp_get_topic_content', 'bbp_pre_code_tags',  25   );
 add_filter( 'bbp_get_topic_content', 'force_balance_tags', 25   );
-add_filter( 'bbp_get_topic_content', 'convert_smilies',    20   );
 add_filter( 'bbp_get_topic_content', 'wpautop',            30   );
 add_filter( 'bbp_get_topic_content', 'bbp_mention_filter', 40   );