Changeset 6489

Timestamp:

11/06/2012 02:41:45 PM (12 years ago)

Author:

djpaul

Message:

Add parameter to bp_get_activity_action() to prevent the timestamp being appended to the action text. Fixes #4648

This was limiting how the function can be used in theme templates; some themes may want to show the timestamp somewhere else.

File:

• trunk/bp-activity/bp-activity-template.php (modified) (3 diffs)

trunk/bp-activity/bp-activity-template.php

@@ -1122 +1122 @@
  * @since BuddyPress (1.2)
  *
+ * @param array $args See bp_get_activity_action()
  * @uses bp_get_activity_action()
  */
-function bp_activity_action() {
-    echo bp_get_activity_action();
+function bp_activity_action( $args = array() ) {
+    echo bp_get_activity_action( $args );
 }
 
@@ -1134 +1135 @@
      *
      * @global object $activities_template {@link BP_Activity_Template}
+     * @param array $args Only parameter is "no_timestamp". If true, timestamp is shown in output.
      * @uses apply_filters_ref_array() To call the 'bp_get_activity_action_pre_meta' hook
      * @uses bp_insert_activity_meta()
@@ -1140 +1142 @@
      * @return string The activity action
      */
-    function bp_get_activity_action() {
-        global $activities_template;
+    function bp_get_activity_action( $args = array() ) {
+        global $activities_template;
+
+        $defaults = array(
+            'no_timestamp' => false,
+        );
+
+        $args = wp_parse_args( $args, $defaults );
+        extract( $args, EXTR_SKIP );
 
         $action = $activities_template->activity->action;
-        $action = apply_filters_ref_array( 'bp_get_activity_action_pre_meta', array( $action, &$activities_template->activity ) );
-
-        if ( !empty( $action ) )
+        $action = apply_filters_ref_array( 'bp_get_activity_action_pre_meta', array( $action, &$activities_template->activity, $args ) );
+
+        if ( ! empty( $action ) && ! $no_timestamp )
             $action = bp_insert_activity_meta( $action );
 
-        return apply_filters_ref_array( 'bp_get_activity_action', array( $action, &$activities_template->activity ) );
+        return apply_filters_ref_array( 'bp_get_activity_action', array( $action, &$activities_template->activity, $args ) );
     }