Changeset 1925

Timestamp:

09/23/2009 12:33:11 AM (16 years ago)

Author:

apeatling

Message:

Modifying kses filter on wire and activity streams to allow for image posting.

Location:

trunk

Files:

• bp-activity/bp-activity-filters.php (modified) (2 diffs)
• bp-core/bp-core-templatetags.php (modified) (1 diff)
• bp-wire/bp-wire-filters.php (modified) (2 diffs)

trunk/bp-activity/bp-activity-filters.php

@@ -2 +2 @@
 
 /* Apply WordPress defined filters */
-add_filter( 'bp_get_activity_content', 'wp_filter_kses', 1 );
+add_filter( 'bp_get_activity_content', 'bp_activity_filter_kses', 1 );
 add_filter( 'bp_get_activity_content', 'force_balance_tags' );
 add_filter( 'bp_get_activity_content', 'wptexturize' );
@@ -11 +11 @@
 add_filter( 'bp_get_activity_content', 'stripslashes_deep' );
 
-function bp_activity_add_allowed_tags( $allowedtags ) {
-    $allowedtags['span'] = array();
-    $allowedtags['span']['class'] = array();
-    $allowedtags['a']['class'] = array();
-    $allowedtags['img'] = array();
-    $allowedtags['img']['src'] = array();
-    $allowedtags['img']['alt'] = array();
-    $allowedtags['img']['class'] = array();
-    $allowedtags['img']['id'] = array();
+function bp_activity_filter_kses( $content ) {
+    global $allowedtags;
     
-    return $allowedtags;
+    $activity_allowedtags = $allowedtags;
+    $activity_allowedtags['span'] = array();
+    $activity_allowedtags['span']['class'] = array();
+    $activity_allowedtags['a']['class'] = array();
+    $activity_allowedtags['img'] = array(); 
+    $activity_allowedtags['img']['src'] = array();
+    $activity_allowedtags['img']['alt'] = array();
+    $activity_allowedtags['img']['class'] = array();
+    $activity_allowedtags['img']['width'] = array();
+    $activity_allowedtags['img']['height'] = array();
+    $activity_allowedtags['img']['class'] = array();
+    $activity_allowedtags['img']['id'] = array();
+
+    return wp_kses( $content, $activity_allowedtags );
 }
-add_filter( 'edit_allowedtags', 'bp_activity_add_allowed_tags', 1 );
+
 
 ?>

trunk/bp-core/bp-core-templatetags.php

@@ -713 +713 @@
 function bp_create_excerpt( $text, $excerpt_length = 55, $filter_shortcodes = true ) { // Fakes an excerpt if needed
     $text = str_replace(']]>', ']]>', $text);
-    $text = strip_tags($text);
-    
+
     if ( $filter_shortcodes )
         $text = preg_replace( '|\[(.+?)\](.+?\[/\\1\])?|s', '', $text );

trunk/bp-wire/bp-wire-filters.php

@@ -2 +2 @@
 
 /* Apply WordPress defined filters */
-add_filter( 'bp_wire_post_content_before_save', 'wp_filter_kses', 1 );
-add_filter( 'bp_get_wire_post_content', 'wp_filter_kses', 1 );
+add_filter( 'bp_wire_post_content_before_save', 'bp_wire_filter_kses', 1 );
+add_filter( 'bp_get_wire_post_content', 'bp_wire_filter_kses', 1 );
 
 add_filter( 'bp_get_wire_post_content', 'wptexturize' );
@@ -13 +13 @@
 
 add_filter( 'bp_wire_post_content_before_save', 'force_balance_tags' );
+add_filter( 'bp_get_wire_post_content', 'force_balance_tags' );
 
-function bp_wire_add_allowed_tags( $allowedtags ) {
-    $allowedtags['strong'] = array();
-    $allowedtags['em'] = array();
-    $allowedtags['img'] = array();
-    return $allowedtags;
+function bp_wire_filter_kses( $content ) {
+    global $allowedtags;
+    
+    $wire_allowedtags = $allowedtags;
+    $wire_allowedtags['img'] = array(); 
+    $wire_allowedtags['img']['src'] = array();
+    $wire_allowedtags['img']['alt'] = array();
+    $wire_allowedtags['img']['class'] = array();
+    $wire_allowedtags['img']['width'] = array();
+    $wire_allowedtags['img']['height'] = array();
+
+    return wp_kses( $content, $wire_allowedtags );
 }
-add_filter( 'edit_allowedtags', 'bp_wire_add_allowed_tags', 1 );
-
 
 ?>