Changeset 9213

Timestamp:

12/04/2014 08:00:17 PM (10 years ago)

Author:

boonebgorges

Message:

Don't use extract() in BP_Activity_Activity::get().

Props r-a-y.
See #5698, #4988.

File:

• trunk/src/bp-activity/bp-activity-classes.php (modified) (8 diffs)

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

@@ -337 +337 @@
         );
         $r = wp_parse_args( $args, $defaults );
-        extract( $r );
 
         // Select conditions
@@ -352 +351 @@
         $excluded_types = array();
 
+        // Regular filtering
+        if ( $r['filter'] && $filter_sql = BP_Activity_Activity::get_filter_sql( $r['filter'] ) ) {
+            $where_conditions['filter_sql'] = $filter_sql;
+        }
+
         // Spam
-        if ( 'ham_only' == $spam )
+        if ( 'ham_only' == $r['spam'] ) {
             $where_conditions['spam_sql'] = 'a.is_spam = 0';
-        elseif ( 'spam_only' == $spam )
+        } elseif ( 'spam_only' == $r['spam'] ) {
             $where_conditions['spam_sql'] = 'a.is_spam = 1';
+        }
 
         // Searching
-        if ( $search_terms ) {
-            $search_terms_like = '%' . bp_esc_like( $search_terms ) . '%';
+        if ( $r['search_terms'] ) {
+            $search_terms_like = '%' . bp_esc_like( $r['search_terms'] ) . '%';
             $where_conditions['search_sql'] = $wpdb->prepare( 'a.content LIKE %s', $search_terms_like );
         }
 
-        // Filtering
-        if ( $filter && $filter_sql = BP_Activity_Activity::get_filter_sql( $filter ) )
-            $where_conditions['filter_sql'] = $filter_sql;
-
         // Sorting
-        if ( $sort != 'ASC' && $sort != 'DESC' )
+        $sort = $r['sort'];
+        if ( $sort != 'ASC' && $sort != 'DESC' ) {
             $sort = 'DESC';
+        }
 
         // Hide Hidden Items?
-        if ( !$show_hidden )
+        if ( ! $r['show_hidden'] )
             $where_conditions['hidden_sql'] = "a.hide_sitewide = 0";
 
         // Exclude specified items
-        if ( !empty( $exclude ) ) {
-            $exclude = implode( ',', wp_parse_id_list( $exclude ) );
+        if ( ! empty( $r['exclude'] ) ) {
+            $exclude = implode( ',', wp_parse_id_list( $r['exclude'] ) );
             $where_conditions['exclude'] = "a.id NOT IN ({$exclude})";
         }
 
         // The specific ids to which you want to limit the query
-        if ( !empty( $in ) ) {
-            $in = implode( ',', wp_parse_id_list( $in ) );
+        if ( ! empty( $r['in'] ) ) {
+            $in = implode( ',', wp_parse_id_list( $r['in'] ) );
             $where_conditions['in'] = "a.id IN ({$in})";
         }
 
         // Process meta_query into SQL
-        $meta_query_sql = self::get_meta_query_sql( $meta_query );
+        $meta_query_sql = self::get_meta_query_sql( $r['meta_query'] );
 
         if ( ! empty( $meta_query_sql['join'] ) ) {
@@ -400 +403 @@
 
         // Process date_query into SQL
-        $date_query_sql = self::get_date_query_sql( $date_query );
+        $date_query_sql = self::get_date_query_sql( $r['date_query'] );
 
         if ( ! empty( $date_query_sql ) ) {
@@ -409 +412 @@
         // comments in the stream like normal comments or threaded below
         // the activity.
-        if ( false === $display_comments || 'threaded' === $display_comments ) {
+        if ( false === $r['display_comments'] || 'threaded' === $r['display_comments'] ) {
             $excluded_types[] = 'activity_comment';
         }
@@ -415 +418 @@
         // Exclude 'last_activity' items unless the 'action' filter has
         // been explicitly set
-        if ( empty( $filter['object'] ) ) {
+        if ( empty( $r['filter']['object'] ) ) {
             $excluded_types[] = 'last_activity';
         }
@@ -469 +472 @@
 
         // Sanitize page and per_page parameters
-        $page     = absint( $page     );
-        $per_page = absint( $per_page );
+        $page     = absint( $r['page']     );
+        $per_page = absint( $r['per_page'] );
 
         $retval = array(
@@ -560 +563 @@
         }
 
-        if ( ! empty( $activity_ids ) && $update_meta_cache ) {
+        if ( ! empty( $activity_ids ) && $r['update_meta_cache'] ) {
             bp_activity_update_meta_cache( $activity_ids );
         }
 
-        if ( $activities && $display_comments )
-            $activities = BP_Activity_Activity::append_comments( $activities, $spam );
+        if ( $activities && $r['display_comments'] ) {
+            $activities = BP_Activity_Activity::append_comments( $activities, $r['spam'] );
+        }
 
         // Pre-fetch data associated with activity users and other objects
@@ -590 +594 @@
             $total_activities     = $wpdb->get_var( $total_activities_sql );
 
-            if ( !empty( $max ) ) {
-                if ( (int) $total_activities > (int) $max )
-                    $total_activities = $max;
+            if ( !empty( $r['max'] ) ) {
+                if ( (int) $total_activities > (int) $r['max'] )
+                    $total_activities = $r['max'];
             }