Changeset 2784 for trunk/bp-activity/bp-activity-templatetags.php

Timestamp:

02/23/2010 08:55:18 PM (17 years ago)

Author:

apeatling

Message:

Merging 1.2 branch into the trunk

File:

• trunk/bp-activity/bp-activity-templatetags.php (modified) (4 diffs)

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

@@ -482 +482 @@
                  */
 
-                $content = bp_get_activity_action() . bp_get_activity_content_body();
+                $content = bp_get_activity_action() . ' ' . bp_get_activity_content_body();
                 return apply_filters( 'bp_get_activity_content', $content );
         }
@@ -499 +499 @@
 
                 /* Add the delete link if the user has permission on this item */
-                if ( ( is_user_logged_in() && $activities_template->activity->user_id == $bp->loggedin_user->id ) || $bp->is_item_admin || is_site_admin() )
+                if ( ( is_user_logged_in() && $activities_template->activity->user_id == $bp->loggedin_user->id ) || $bp->is_item_admin || $bp->loggedin_user->is_site_admin )
                          $content .= apply_filters( 'bp_activity_delete_link', ' · ' . bp_get_activity_delete_link(), &$activities_template->activity );
 
@@ -529 +529 @@
                         $content = $activities_template->activity_parents[$parent_id]->action;
                 else
-                        $content = $activities_template->activity_parents[$parent_id]->action . $activities_template->activity_parents[$parent_id]->content;
+                        $content = $activities_template->activity_parents[$parent_id]->action . ' ' . $activities_template->activity_parents[$parent_id]->content;
 
                 /* Remove the time since content for backwards compatibility */
@@ -946 +946 @@
                         $content = $activities_template->activity->content;
                 else
-                        $content = $activities_template->activity->action . $activities_template->activity->content;
+                        $content = $activities_template->activity->action . ' ' . $activities_template->activity->content;
 
                 return apply_filters( 'bp_get_activity_feed_item_description', html_entity_decode( str_replace( '%s', '', $content ) ) );