Changeset 5833

Timestamp:

02/23/2012 07:29:36 AM (13 years ago)

Author:

johnjamesjacoby

Message:

Backport messages output filters from trunk. See #4010, #4038. (1.5 branch)

Location:

branches/1.5/bp-core

Files:

• bp-core-filters.php (modified) (1 diff)
• bp-core-functions.php (modified) (1 diff)

branches/1.5/bp-core/bp-core-filters.php

@@ -2 +2 @@
 // Exit if accessed directly
 if ( !defined( 'ABSPATH' ) ) exit;
+
+// Add some filters to feedback messages
+add_filter( 'bp_core_render_message_content', 'wptexturize'       );
+add_filter( 'bp_core_render_message_content', 'convert_smilies'   );
+add_filter( 'bp_core_render_message_content', 'convert_chars'     );
+add_filter( 'bp_core_render_message_content', 'wpautop'           );
+add_filter( 'bp_core_render_message_content', 'shortcode_unautop' );
 
 /**

branches/1.5/bp-core/bp-core-functions.php

@@ -553 +553 @@
     global $bp;
 
-    if ( isset( $bp->template_message ) && $bp->template_message ) :
-        $type = ( 'success' == $bp->template_message_type ) ? 'updated' : 'error'; ?>
+    if ( !empty( $bp->template_message ) ) :
+        $type    = ( 'success' == $bp->template_message_type ) ? 'updated' : 'error';
+        $content = apply_filters( 'bp_core_render_message_content', $bp->template_message, $type ); ?>
 
         <div id="message" class="<?php echo $type; ?>">
-            <p><?php echo stripslashes( esc_attr( $bp->template_message ) ); ?></p>
+
+            <?php echo $content; ?>
+
         </div>