Changeset 11351

Timestamp:

12/29/2016 02:08:09 AM (8 years ago)

Author:

boonebgorges

Message:

bp_get_activity_content_body filter should receive same params in all contexts.

This changeset makes all instances of bp_get_activity_content_body
consistent by ensuring that they all receive the activity object
as a second parameter. This requires switching to apply_filters_ref_array(),
so that the second param can always be passed by reference.

Props sanket.parmar.
Fixes #6971.

Location:

trunk/src

Files:

• bp-activity/bp-activity-functions.php (modified) (2 diffs)
• bp-activity/bp-activity-template.php (modified) (1 diff)
• bp-activity/classes/class-bp-activity-list-table.php (modified) (1 diff)
• bp-templates/bp-legacy/buddypress-functions.php (modified) (1 diff)

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

@@ -3442 +3442 @@
 
     /** This filter is documented in bp-activity/bp-activity-template.php */
-    $content = apply_filters( 'bp_get_activity_content_body', $activity->content );
+    $content = apply_filters_ref_array( 'bp_get_activity_content_body', array( $activity->content, &$activity ) );
 
     add_filter( 'bp_get_activity_content_body', 'convert_smilies' );
@@ -3510 +3510 @@
 
     /** This filter is documented in bp-activity/bp-activity-template.php */
-    $content = apply_filters( 'bp_get_activity_content_body', $params['content'] );
+    $content = apply_filters_ref_array( 'bp_get_activity_content_body', array( $params['content'], &$original_activity ) );
 
     add_filter( 'bp_get_activity_content_body', 'convert_smilies' );

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

@@ -1391 +1391 @@
          * @since 1.2.0
          *
-         * @param array $value Array containing the current activity content body and the current activity.
+         * @param string $content  Content body.
+         * @param object $activity Activity object. Passed by reference.
          */
         return apply_filters_ref_array( 'bp_get_activity_content_body', array( $activities_template->activity->content, &$activities_template->activity ) );

trunk/src/bp-activity/classes/class-bp-activity-list-table.php

@@ -642 +642 @@
         // Get activity content - if not set, use the action.
         if ( ! empty( $item['content'] ) ) {
-
-            /**
-             * Filters current activity item content.
-             *
-             * @since 1.2.0
-             *
-             * @param array $item Array index holding current activity item content.
-             */
-            $content = apply_filters_ref_array( 'bp_get_activity_content_body', array( $item['content'] ) );
+            $activity = new BP_Activity_Activity( $item['id'] );
+
+            /** This filter is documented in bp-activity/bp-activity-template.php */
+            $content = apply_filters_ref_array( 'bp_get_activity_content_body', array( $item['content'], &$activity ) );
         } else {
             /**

trunk/src/bp-templates/bp-legacy/buddypress-functions.php

@@ -1251 +1251 @@
 
     /** This filter is documented in bp-activity/bp-activity-template.php */
-    $content = apply_filters( 'bp_get_activity_content_body', $activity->content );
+    $content = apply_filters_ref_array( 'bp_get_activity_content_body', array( $activity->content, &$activity ) );
 
     exit( $content );