Ticket #8052: 8052.2.patch

src/bp-activity/bp-activity-functions.php

@@ -3460 +3460 @@
                 'width' => isset( $GLOBALS['content_width'] ) ? (int) $GLOBALS['content_width'] : 'medium',
         );
 
-        $post_url = '';
+        $post_url        = '';
+        $post_title      = '';
+        $bp_excerpt_args = array(
+                'html'              => false,
+                'filter_shortcodes' => true,
+                'strip_tags'        => true,
+                'remove_links'      => true,
+        );
         // Get the WP_Post object if this activity type is a blog post.
         if ( $activity['type'] === 'new_blog_post' ) {
-                $content  = get_post( $activity['secondary_item_id'] );
-                $post_url = $content->guid;
+                $content    = get_post( $activity['secondary_item_id'] );
+                $post_url   = $content->guid;
+                $post_title = sprintf(
+                        '<strong><a href="%1$s">%2$s</a></strong>',
+                        esc_url( $post_url ),
+                        esc_html( $content->post_title )
+                );
+
+                $more_text  = sprintf(
+                        '<span>%s</span>',
+                        trim( __( ' [&hellip;]', 'buddypress' ) )
+                );
+
+                /** This filter is documented in wp-admin/includes/post-template.php */
+                $bp_excerpt_args['ending'] = apply_filters(
+                        'the_content_more_link',
+                        sprintf(
+                                ' <a href="%1$s">%2$s</a>',
+                                esc_url( $post_url ),
+                                $more_text
+                        ),
+                        $more_text
+                );
         }
 
         /**
@@ -3579 +3607 @@
         }
 
         // Generate a text excerpt for this activity item (and remove any oEmbeds URLs).
-        $summary = bp_create_excerpt( html_entity_decode( $content ), 225, array(
-                'html' => false,
-                'filter_shortcodes' => true,
-                'strip_tags'        => true,
-                'remove_links'      => true
-        ) );
+        $summary_parts = array(
+                str_replace(
+                        array( "\n", "\r" ),
+                        ' ',
+                        trim( bp_create_excerpt( html_entity_decode( $content ), 225, $bp_excerpt_args ) )
+                ),
+        );
 
         if ( $use_media_type === 'embeds' ) {
-                $summary .= PHP_EOL . PHP_EOL . $extracted_media['url'];
+                $summary_parts[] = PHP_EOL . PHP_EOL . $extracted_media['url'];
         } elseif ( $use_media_type === 'images' ) {
                 $extracted_media_url = isset( $extracted_media['url'] ) ? $extracted_media['url'] : '';
+                $image_tag           = sprintf( '<img src="%s"> ', esc_url( $extracted_media_url ) );
 
                 if ( $post_url ) {
-                        $summary .= sprintf( '<a href="%1$s" class="activity-post-featured-image"><img src="%2$s"></a>', esc_url( $post_url ), esc_url( $extracted_media_url ) );
-                } else {
-                        $summary .= sprintf( ' <img src="%s">', esc_url( $extracted_media_url ) );
+                        $image_tag = sprintf( '<a href="%1$s" class="activity-post-featured-image">%2$s</a> ', esc_url( $post_url ), trim( $image_tag ) );
+                        array_unshift( $summary_parts, $image_tag );
                 }
         } elseif ( in_array( $use_media_type, array( 'audio', 'videos' ), true ) ) {
-                $summary .= PHP_EOL . PHP_EOL . $extracted_media['original'];  // Full shortcode.
+                $summary_parts[] = PHP_EOL . PHP_EOL . $extracted_media['original'];  // Full shortcode.
+        }
+
+        if ( $post_title ) {
+                array_unshift( $summary_parts, $post_title );
         }
 
+        // Join summary parts.
+        $summary = implode( '', $summary_parts );
+
         /**
          * Filters the newly-generated summary for the activity item.
          *

src/bp-templates/bp-legacy/css/buddypress-rtl.css

@@ -326 +326 @@
         padding-right: 10px;
 }
 
+#buddypress .activity-list li.new_blog_post .activity-content .activity-inner strong {
+        display: block;
+        margin-bottom: 0.8em;
+}
+
+#buddypress .activity-list li.new_blog_post .activity-content .activity-inner img {
+        float: right;
+        margin-left: 0.8em;
+}
+
 body.activity-permalink #buddypress .activity-content .activity-inner,
 body.activity-permalink #buddypress .activity-content blockquote {
         margin-right: 0;

src/bp-templates/bp-legacy/css/buddypress.css

@@ -326 +326 @@
         padding-left: 10px;
 }
 
+#buddypress .activity-list li.new_blog_post .activity-content .activity-inner strong {
+        display: block;
+        margin-bottom: 0.8em;
+}
+
+#buddypress .activity-list li.new_blog_post .activity-content .activity-inner img {
+        float: left;
+        margin-right: 0.8em;
+}
+
 body.activity-permalink #buddypress .activity-content .activity-inner,
 body.activity-permalink #buddypress .activity-content blockquote {
         margin-left: 0;

src/bp-templates/bp-nouveau/common-styles/_bp_activity_entries.scss

@@ -90 +90 @@
                         }
                 } // close li forum elements
 
+                &.new_blog_post {
+
+                        .activity-inner {
+
+                                strong {
+                                        display: block;
+                                        margin-bottom: 0.8em;
+                                }
+
+                                img {
+                                        float: left;
+                                        margin-right: 0.8em;
+                                }
+                        }
+                } // close li blog post elements
+
 
                 &.newest_mentions_activity,
                 &.newest_friends_activity,

src/bp-templates/bp-nouveau/css/buddypress-rtl.css

@@ -1306 +1306 @@
         padding-right: 1em;
 }
 
+.activity-list .activity-item.new_blog_post .activity-inner strong {
+        display: block;
+        margin-bottom: 0.8em;
+}
+
+.activity-list .activity-item.new_blog_post .activity-inner img {
+        float: right;
+        margin-left: 0.8em;
+}
+
 .activity-list .activity-item.newest_mentions_activity, .activity-list .activity-item.newest_friends_activity, .activity-list .activity-item.newest_groups_activity, .activity-list .activity-item.newest_blogs_activity {
         background: rgba(31, 179, 221, 0.1);
 }

src/bp-templates/bp-nouveau/css/buddypress.css

@@ -1306 +1306 @@
         padding-left: 1em;
 }
 
+.activity-list .activity-item.new_blog_post .activity-inner strong {
+        display: block;
+        margin-bottom: 0.8em;
+}
+
+.activity-list .activity-item.new_blog_post .activity-inner img {
+        float: left;
+        margin-right: 0.8em;
+}
+
 .activity-list .activity-item.newest_mentions_activity, .activity-list .activity-item.newest_friends_activity, .activity-list .activity-item.newest_groups_activity, .activity-list .activity-item.newest_blogs_activity {
         background: rgba(31, 179, 221, 0.1);
 }