Changeset 1492

Timestamp:

06/01/2009 08:59:39 PM (16 years ago)

Author:

apeatling

Message:

Fixed wp_kses filter on activity content. Added option to allow BP to run on multiple blogs, instead of just one fixed blog by using the "BP_ENABLE_MULTIBLOG" constant.

Location:

trunk

Files:

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

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

@@ -14 +14 @@
 add_filter( 'bp_get_activity_content', 'make_clickable' );
 
-add_filter( 'bp_get_activity_content', 'wp_filter_kses' );
-
 ?>

trunk/bp-activity/bp-activity-templatetags.php

@@ -220 +220 @@
 }
     function bp_get_activity_content() {
-        global $activities_template;
+        global $activities_template, $allowed_tags;
 
         if ( bp_is_home() && $activities_template->activity_type == 'personal' ) {
-            return apply_filters( 'bp_get_activity_content', bp_activity_content_filter( $activities_template->activity->content, $activities_template->activity->date_recorded, $activities_template->full_name ) );                       
+            $content = apply_filters( 'bp_get_activity_content', bp_activity_content_filter( $activities_template->activity->content, $activities_template->activity->date_recorded, $activities_template->full_name ) );                       
         } else {
             $activities_template->activity->content = bp_activity_insert_time_since( $activities_template->activity->content, $activities_template->activity->date_recorded );
-            return apply_filters( 'bp_get_activity_content', $activities_template->activity->content );
-        }
+            $content = apply_filters( 'bp_get_activity_content', $activities_template->activity->content );
+        }
+        
+        $allowed_tags .= '<span><img>';
+        return wp_kses( $content, $allowed_tags );
     }
 

trunk/bp-core/bp-core-catchuri.php

@@ -33 +33 @@
     global $bp, $current_blog;
     
-    /* Only catch URI's on the root blog */
-    if ( BP_ROOT_BLOG != (int) $current_blog->blog_id )
-        return false;
+    if ( !defined( 'BP_ENABLE_MULTIBLOG' ) ) {
+        /* Only catch URI's on the root blog if we are not running BP on multiple blogs */
+        if ( BP_ROOT_BLOG != (int) $current_blog->blog_id )
+            return false;
+    }
     
     if ( strpos( $_SERVER['REQUEST_URI'], 'bp-core-ajax-handler.php' ) )
@@ -52 +54 @@
     $bp_uri = explode( "/", $path );
     
+    if ( defined( 'BP_ENABLE_MULTIBLOG' ) ) {
+        /* If we are running BuddyPress on any blog, not just a root blog, we need to first
+           shift off the blog name if we are running a subdirectory install of WPMU. */
+        if ( $current_blog->path != '/' )
+            array_shift( $bp_uri );
+    }
+    
     /* Take empties off the end of complete URI */
     if ( empty( $bp_uri[count($bp_uri) - 1] ) )
@@ -58 +67 @@
     /* Take empties off the start of complete URI */
     if ( empty( $bp_uri[0] ) )
+        array_shift( $bp_uri );
+    
+    if ( (int)$current_blog->blog_id == 2 )
         array_shift( $bp_uri );
         

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

@@ -464 +464 @@
 
 function bp_page_title() {
-    global $bp, $post, $wp_query;
+    echo bp_get_page_title();
+}
+
+function bp_get_page_title() {
+    global $bp, $post, $wp_query, $current_blog;
 
     if ( is_home() && bp_is_page( 'home' ) ) {
@@ -492 +496 @@
     }
     
-    echo apply_filters( 'bp_page_title', get_blog_option( BP_ROOT_BLOG, 'blogname' ) . ' — ' . attribute_escape( $title ), attribute_escape( $title ) );
-    
+    if ( defined( 'BP_ENABLE_MULTIBLOG' ) ) {
+        $blog_title = get_blog_option( $current_blog->blog_id, 'blogname' );
+    } else {
+        $blog_title = get_blog_option( BP_ROOT_BLOG, 'blogname' );      
+    }
+    
+    return apply_filters( 'bp_page_title', $blog_title . ' — ' . attribute_escape( $title ), attribute_escape( $title ) );
 }
 
@@ -1057 +1066 @@
 
 function bp_home_blog_url() {
-    global $bp;
-
-    if ( 'bphome' == get_blog_option( BP_ROOT_BLOG, 'template' ) )
+    global $bp, $current_blog;
+    
+    if ( defined( 'BP_ENABLE_MULTIBLOG' ) ) {
+        $blog_id = $current_blog->blog_id;
+    } else {
+        $blog_id = BP_ROOT_BLOG;
+    }
+
+    if ( 'bphome' == get_blog_option( $blog_id, 'template' ) )
         echo $bp->root_domain . '/' . BP_HOME_BLOG_SLUG;
     else