Changeset 2383

Timestamp:

01/20/2010 05:43:49 PM (15 years ago)

Author:

apeatling

Message:

Auto thumbnail the first image in a blog post and display it on the activity stream. This stops huge images in blogs posts from displaying on the stream and messing with the design. Fixes #1620

Location:

trunk

Files:

• bp-activity.php (modified) (3 diffs)
• bp-activity/bp-activity-templatetags.php (modified) (2 diffs)
• bp-blogs.php (modified) (4 diffs)
• bp-core/bp-core-templatetags.php (modified) (1 diff)
• bp-themes/bp-default/_inc/css/default.css (modified) (4 diffs)

trunk/bp-activity.php

@@ -487 +487 @@
         $content = bp_activity_add_timesince_placeholder( $content );
 
-    /* Remove any images and replace the first image with a thumbnail */
-    //$content = bp_activity_thumbnail_images( $content );
-
     $activity = new BP_Activity_Activity( $id );
 
@@ -710 +707 @@
 }
 
-function bp_activity_thumbnail_images( $content ) {
+function bp_activity_thumnail_content_images( $content ) {
     preg_match_all( '/<img[^>]*>/Ui', $content, $matches );
     $content = preg_replace('/<img[^>]*>/Ui', '', $content );
@@ -718 +715 @@
         preg_match( '/<img.*?(src\=[\'|"]{0,1}.*?[\'|"]{0,1})[\s|>]{1}/i', $matches[0][0], $src );
 
+        /* Get the width and height */
+        preg_match( '/<img.*?(height\=[\'|"]{0,1}.*?[\'|"]{0,1})[\s|>]{1}/i', $matches[0][0], $height );
+        preg_match( '/<img.*?(width\=[\'|"]{0,1}.*?[\'|"]{0,1})[\s|>]{1}/i', $matches[0][0], $width );
+
         if ( !empty( $src ) ) {
             $src = substr( substr( str_replace( 'src=', '', $src[1] ), 0, -1 ), 1 );
-            $pos = strpos( $content, '<blockquote>' );
-            $before = substr( $content, 0, (int) $pos );
-            $after = substr( $content, (int) $pos, strlen( $content ) );
-
-            $content = $before . '<img src="' . esc_attr( $src) . '" width="100" height="100" alt="thumb" class="align-left thumbnail" />' . $after;
+            $height = substr( substr( str_replace( 'height=', '', $height[1] ), 0, -1 ), 1 );
+            $width = substr( substr( str_replace( 'width=', '', $width[1] ), 0, -1 ), 1 );
+
+            if ( empty( $width ) || empty( $height ) ) {
+                $width = 100;
+                $height = 100;
+            }
+
+            $ratio = (int)$width / (int)$height;
+            $new_height = 100;
+            $new_width = $new_height * $ratio;
+
+            $content = '<img src="' . esc_attr( $src) . '" width="' . $new_width . '" height="' . $new_height . '" alt="' . __( 'Thumbnail', 'buddypress' ) . '" class="align-left thumbnail" />' . $content;
         }
     }

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

@@ -559 +559 @@
         global $activities_template;
 
-        $mini_activity_actions = apply_filters( 'bp_activity_mini_activity_actions', array(
+        $mini_activity_actions = apply_filters( 'bp_activity_mini_activity_types', array(
             'friendship_accepted',
             'friendship_created',
@@ -569 +569 @@
 
         $class = '';
-        if ( in_array( $activities_template->activity->type, (array)$mini_activity_actions ) )
+        if ( in_array( $activities_template->activity->type, (array)$mini_activity_actions ) || empty( $activities_template->activity->content ) )
             $class = ' mini';
 

trunk/bp-blogs.php

@@ -260 +260 @@
     extract( $r, EXTR_SKIP );
 
+    /* Remove large images and replace them with just one image thumbnail */
+    if ( function_exists( 'bp_activity_thumnail_content_images' ) && !empty( $content ) )
+        $content = bp_activity_thumnail_content_images( $content );
+
+    $action = apply_filters( 'bp_blogs_record_activity_action', $action );
+    $content = apply_filters( 'bp_blogs_record_activity_content', "<blockquote>" . bp_create_excerpt( $content ) . "</blockquote>" );
+
     return bp_activity_add( array( 'user_id' => $user_id, 'action' => $action, 'content' => $content, 'primary_link' => $primary_link, 'component' => $component, 'type' => $type, 'item_id' => $item_id, 'secondary_item_id' => $secondary_item_id, 'recorded_time' => $recorded_time, 'hide_sitewide' => $hide_sitewide ) );
 }
@@ -391 +398 @@
 
                 $activity_action = sprintf( __( '%s wrote a new blog post: %s', 'buddypress' ), bp_core_get_userlink( (int)$post->post_author ), '<a href="' . $post_permalink . '">' . $post->post_title . '</a>' );
-                $activity_content = "<blockquote>" . bp_create_excerpt( $post->post_content ) . "</blockquote>";
+                $activity_content = $post->post_content;
 
                 bp_blogs_record_activity( array(
@@ -429 +436 @@
 
             $activity_action = sprintf( __( '%s wrote a new blog post: %s', 'buddypress' ), bp_core_get_userlink( (int)$post->post_author ), '<a href="' . $post_permalink . '">' . $post->post_title . '</a>' );
-            $activity_content = "<blockquote>" . bp_create_excerpt( $post->post_content ) . "</blockquote>";
+            $activity_content = $post->post_content;
 
             /* Record this in activity streams */
@@ -487 +494 @@
         $comment_link = bp_post_get_permalink( $comment->post, $wpdb->blogid ) . '#comment-' . $comment_id;
         $activity_action = sprintf( __( '%s commented on the blog post %s', 'buddypress' ), bp_core_get_userlink( $user_id ), '<a href="' . $comment_link . '#comment-' . $comment->comment_ID . '">' . $comment->post->post_title . '</a>' );
-        $activity_content = '<blockquote>' . bp_create_excerpt( $comment->comment_content ) . '</blockquote>';
+        $activity_content = $comment->comment_content;
 
         /* Record this in activity streams */

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

@@ -1096 +1096 @@
     return apply_filters( 'bp_create_excerpt', $text );
 }
-add_filter( 'bp_create_excerpt', 'wptexturize' );
-add_filter( 'bp_create_excerpt', 'convert_smilies' );
-add_filter( 'bp_create_excerpt', 'convert_chars' );
-add_filter( 'bp_create_excerpt', 'wpautop' );
 add_filter( 'bp_create_excerpt', 'wp_trim_excerpt' );
 add_filter( 'bp_create_excerpt', 'stripslashes_deep' );

trunk/bp-themes/bp-default/_inc/css/default.css

@@ -1059 +1059 @@
         padding: 0;
         margin: 0;
+        overflow: auto;
     }
 
@@ -1141 +1142 @@
     .activity-list .activity-content blockquote {
         margin: 15px 0 15px 5px;
+        overflow: auto;
     }
         body.activity-permalink .activity-content .activity-inner,
@@ -1146 +1148 @@
             margin-top: 5px;
         }
+
+    .activity-list .activity-content img.thumbnail {
+        float: left;
+        margin: 0 10px 5px 0;
+        border: 2px solid #eee;
+    }
 
 .activity-list li.load-more {
@@ -1168 +1176 @@
 div.activity-meta {
     margin: 0 0 20px 3px;
+    clear: left;
 }