Changeset 911

Timestamp:

01/23/2009 08:04:13 PM (16 years ago)

Author:

apeatling

Message:

Fixes #385

Location:

trunk

Files:

• bp-core.php (modified) (2 diffs)
• bp-forums/bp-forums-templatetags.php (modified) (1 diff)
• bp-groups.php (modified) (2 diffs)

trunk/bp-core.php

@@ -763 +763 @@
  * @return str The excerpt text
  */
-function bp_create_excerpt( $text, $excerpt_length = 55 ) { // Fakes an excerpt if needed
+function bp_create_excerpt( $text, $excerpt_length = 55, $filter_shortcodes = true ) { // Fakes an excerpt if needed
     $text = str_replace(']]>', ']]>', $text);
     $text = strip_tags($text);
-    $text = preg_replace( '|\[(.+?)\](.+?\[/\\1\])?|s', '', $text );
+    
+    if ( $filter_shortcodes )
+        $text = preg_replace( '|\[(.+?)\](.+?\[/\\1\])?|s', '', $text );
     
     $words = explode(' ', $text, $excerpt_length + 1);
@@ -1273 +1275 @@
 add_action( 'bp_core_render_notice', 'bp_core_clear_cache' );
 
+// Remove the catch non existent blogs hook so WPMU doesn't think BuddyPress pages are non existing blogs
+//remove_action( 'plugins_loaded', 'catch_nonexistant_blogs' );
+
 ?>

trunk/bp-forums/bp-forums-templatetags.php

@@ -239 +239 @@
     
     $posts = bp_forums_get_posts( $forum_template->topic->topic_id );
-    echo apply_filters( 'bp_the_topic_latest_post_excerpt', bp_create_excerpt( $posts[count($posts) - 1]['post_text'] ) );
+    echo "test";
+    echo apply_filters( 'bp_the_topic_latest_post_excerpt', bp_create_excerpt( $posts[count($posts) - 1]['post_text'] ), 55, false );
 }
 

trunk/bp-groups.php

@@ -948 +948 @@
                 $group_link = bp_group_permalink( $group, false );
 
-                $post_content = apply_filters( 'bp_the_topic_post_content', bp_create_excerpt( stripslashes( $forum_post['post_text'] ) ) );
+                $post_content = apply_filters( 'bp_the_topic_post_content', bp_create_excerpt( stripslashes( $forum_post['post_text'] ), 55, false ) );
             
                 $content = sprintf ( __('%s posted on the forum topic %s in the group %s:', 'buddypress'), $user_link, '<a href="' . $group_link . '/forum/topic/' . $forum_topic['topic_id'] . '">' . $forum_topic['topic_title'] . '</a>', '<a href="' . $group_link . '">' . $group->name . '</a>' ) . ' <span class="time-since">%s</span>';            
@@ -973 +973 @@
                 $group_link = bp_group_permalink( $group, false );
                 
-                $post_content = apply_filters( 'bp_the_topic_post_content', bp_create_excerpt( stripslashes( $forum_post['post_text'] ) ) );
+                $post_content = apply_filters( 'bp_the_topic_post_content', bp_create_excerpt( stripslashes( $forum_post['post_text'] ), 55, false ) );
                 
                 $content = sprintf ( __('%s created the forum topic %s in the group %s:', 'buddypress'), $user_link, '<a href="' . $group_link . '/forum/topic/' . $forum_topic['topic_id'] . '">' . $forum_topic['topic_title'] . '</a>', '<a href="' . $group_link . '">' . $group->name . '</a>' ) . ' <span class="time-since">%s</span>';