Changeset 3610

Timestamp:

12/29/2010 03:22:44 PM (16 years ago)

Author:

boonebgorges

Message:

Changes bp_create_excerpt() so that excerpts are generated using character counts rather than word counts. Modifies excerpt_length throughout BP to account for the change. Fixes #1222

Location:

trunk

Files:

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

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

@@ -863 +863 @@
                         return false;
 
-                $latest_update = '"' . apply_filters( 'bp_get_activity_latest_update_excerpt', trim( strip_tags( bp_create_excerpt( $update['content'], 40 ) ) ) ) . '"';
+                $latest_update = '"' . apply_filters( 'bp_get_activity_latest_update_excerpt', trim( strip_tags( bp_create_excerpt( $update['content'], 180 ) ) ) ) . '"';
                 $latest_update .= ' &middot; <a href="' . $bp->root_domain . '/' . BP_ACTIVITY_SLUG . '/p/' . $update['id'] . '/"> ' . __( 'View', 'buddypress' ) . '</a>';
 
@@ -1102 +1102 @@
 
                 if ( 'activity_update' == $activities_template->activity->type )
-                        $title .= ': ' . strip_tags( bp_create_excerpt( $activities_template->activity->content, 15 ) );
+                        $title .= ': ' . strip_tags( bp_create_excerpt( $activities_template->activity->content, 70 ) );
 
                 return apply_filters( 'bp_get_activity_feed_item_title', $title );

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

@@ -375 +375 @@
 
                 $defaults = array(
-                        'length' => 15
+                        'length' => 70
                 );
 
@@ -1116 +1116 @@
  * @return str The excerpt text
  */
-function bp_create_excerpt( $text, $excerpt_length = 55, $filter_shortcodes = true ) { // Fakes an excerpt if needed
+function bp_create_excerpt( $text, $excerpt_length = 225, $filter_shortcodes = true ) { // Fakes an excerpt if needed
         $original_text = $text;
         $text = str_replace(']]>', ']]>', $text);
@@ -1123 +1123 @@
                 $text = preg_replace( '|\[(.+?)\](.+?\[/\\1\])?|s', '', $text );
 
-        $words = preg_split(
-                "%\s*((?:<[^>]+>)+\S*)\s*|\s+%s",
-                $text,
-                $excerpt_length + 1,
-                PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE
-        );
-
-        if (count($words) > $excerpt_length) {
-                array_pop($words);
-                array_push($words, '[...]');
-                $text = implode(' ', $words);
-        }
-
+        preg_match( "%\s*((?:<[^>]+>)+\S*)\s*|\s+%s", $text, $matches, PREG_OFFSET_CAPTURE, $excerpt_length );
+        
+        if ( !empty( $matches ) ) {
+                $pos = array_pop( array_pop( $matches ) );      
+                $text = substr( $text, 0, $pos ) . ' [...]';
+        }
+        
         return apply_filters( 'bp_create_excerpt', $text, $original_text );
 }

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

@@ -520 +520 @@
 
                 $defaults = array(
-                        'length' => 10
+                        'length' => 45
                 );
 

trunk/bp-messages/bp-messages-templatetags.php

@@ -214 +214 @@
                 global $messages_template;
 
-                return apply_filters( 'bp_get_message_thread_excerpt', strip_tags( bp_create_excerpt( $messages_template->thread->last_message_content, 10 ) ) );
+                return apply_filters( 'bp_get_message_thread_excerpt', strip_tags( bp_create_excerpt( $messages_template->thread->last_message_content, 75 ) ) );
         }