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

Timestamp:

04/13/2010 04:01:07 PM (14 years ago)

Author:

apeatling

Message:

Replacing function_exists() checks with bp_is_active() checks.

File:

• trunk/bp-activity/bp-activity-templatetags.php (modified) (1 diff)

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

@@ -494 +494 @@
         global $activities_template, $bp;
 
-        /* Strip any legacy time since placeholders -- TODO: Remove this in 1.3 */
-        $content = str_replace( '<span class="time-since">%s</span>', '', $content );
+        $meta = '<span class="activity-actions">';
 
         /* Insert the time since. */
-        $content .= ' ' . apply_filters( 'bp_activity_time_since', '<span class="time-since">' . sprintf( __( '&nbsp; %s ago', 'buddypress' ), bp_core_time_since( $activities_template->activity->date_recorded ) ) . '</span>', &$activities_template->activity );
+        $meta .= apply_filters( 'bp_activity_time_since', '<span class="time-since">' . sprintf( __( '&nbsp; %s ago', 'buddypress' ), bp_core_time_since( $activities_template->activity->date_recorded ) ) . '</span>', &$activities_template->activity );
 
         /* Insert the permalink */
-        $content .= apply_filters( 'bp_activity_permalink', ' &middot; <a href="' . bp_activity_get_permalink( $activities_template->activity->id, $activities_template->activity ) . '" class="view" title="' . __( 'View Thread / Permalink', 'buddypress' ) . '">' . __( 'View', 'buddypress' ) . '</a>', &$activities_template->activity );
+        $meta .= apply_filters( 'bp_activity_permalink', ' &middot; <a href="' . bp_activity_get_permalink( $activities_template->activity->id, $activities_template->activity ) . '" class="view" title="' . __( 'View Thread / Permalink', 'buddypress' ) . '">' . __( 'View', 'buddypress' ) . '</a>', &$activities_template->activity );
 
         /* 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 || $bp->loggedin_user->is_site_admin )
-             $content .= apply_filters( 'bp_activity_delete_link', ' &middot; ' . bp_get_activity_delete_link(), &$activities_template->activity );
-
-        return apply_filters( 'bp_insert_activity_meta', $content );
+             $meta .= apply_filters( 'bp_activity_delete_link', ' &middot; ' . bp_get_activity_delete_link(), &$activities_template->activity );
+
+        $meta .= '</span>';
+
+        return apply_filters( 'bp_insert_activity_meta', $content . ' ' . $meta, $content, $meta );
     }