Changeset 8475

Timestamp:

06/04/2014 04:46:39 PM (10 years ago)

Author:

boonebgorges

Message:

Don't use extract() in bp_blogs_record_activity()

File:

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

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

@@ -288 +288 @@
 
     $r = wp_parse_args( $args, $defaults );
-    extract( $r, EXTR_SKIP );
 
     // Remove large images and replace them with just one image thumbnail
-    if ( ! empty( $content ) ) {
-        $content = bp_activity_thumbnail_content_images( $content, $primary_link, $r );
-    }
-
-    if ( ! empty( $action ) ) {
-        $action = apply_filters( 'bp_blogs_record_activity_action', $action );
-    }
-
-    if ( ! empty( $content ) ) {
-        $content = apply_filters( 'bp_blogs_record_activity_content', bp_create_excerpt( $content ), $content, $r );
+    if ( ! empty( $r['content'] ) ) {
+        $r['content'] = bp_activity_thumbnail_content_images( $r['content'], $r['primary_link'], $r );
+    }
+
+    if ( ! empty( $r['action'] ) ) {
+        $r['action'] = apply_filters( 'bp_blogs_record_activity_action', $r['action'] );
+    }
+
+    if ( ! empty( $r['content'] ) ) {
+        $r['content'] = apply_filters( 'bp_blogs_record_activity_content', bp_create_excerpt( $r['content'] ), $r['content'], $r );
     }
 
     // Check for an existing entry and update if one exists.
     $id = bp_activity_get_activity_id( array(
-        'user_id'           => $user_id,
-        'component'         => $component,
-        'type'              => $type,
-        'item_id'           => $item_id,
-        'secondary_item_id' => $secondary_item_id
+        'user_id'           => $r['user_id'],
+        'component'         => $r['component'],
+        'type'              => $r['type'],
+        'item_id'           => $r['item_id'],
+        'secondary_item_id' => $r['secondary_item_id'],
     ) );
 
-    return bp_activity_add( array( 'id' => $id, 'user_id' => $user_id, 'action' => $action, 'content' => $content, 'primary_link' => $primary_link, 'component' => $component, 'type' => $type, 'item_id' => $item_id, 'secondary_item_id' => $secondary_item_id, 'recorded_time' => $recorded_time, 'hide_sitewide' => $hide_sitewide ) );
+    return bp_activity_add( array( 'id' => $id, 'user_id' => $r['user_id'], 'action' => $r['action'], 'content' => $r['content'], 'primary_link' => $r['primary_link'], 'component' => $r['component'], 'type' => $r['type'], 'item_id' => $r['item_id'], 'secondary_item_id' => $r['secondary_item_id'], 'recorded_time' => $r['recorded_time'], 'hide_sitewide' => $r['hide_sitewide'] ) );
 }