Changeset 2946 for trunk/bp-activity/bp-activity-classes.php

Timestamp:

04/21/2010 11:34:12 AM (16 years ago)

Author:

apeatling

Message:

Merging 1.2 branch with trunk

File:

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

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

@@ -35 +35 @@
             $this->component = $row->component;
             $this->type = $row->type;
-            $this->action = $row->type;
+            $this->action = $row->action;
             $this->content = $row->content;
             $this->date_recorded = $row->date_recorded;
@@ -98 +98 @@
         $where_conditions = array();
 
+        /* 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 = 'DESC';
+
+        /* Hide Hidden Items? */
+        if ( !$show_hidden )
+            $where_conditions['hidden_sql'] = "a.hide_sitewide = 0";
+
+        /* Alter the query based on whether we want to show activity item comments in the stream like normal comments or threaded below the activity */
+        if ( !$display_comments || 'threaded' == $display_comments ) {
+            $where_conditions[] = "a.type != 'activity_comment'";
+        }
+
+        $where_sql = 'WHERE ' . join( ' AND ', $where_conditions );
+
         /* Searching */
         if ( $search_terms ) {
             $search_terms = $wpdb->escape( $search_terms );
-            $where_conditions['search_sql'] = "a.content LIKE '%%" . like_escape( $search_terms ) . "%%'";
-        }
-
-        /* 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 = 'DESC';
-
-        /* Hide Hidden Items? */
-        if ( !$show_hidden )
-            $where_conditions['hidden_sql'] = "a.hide_sitewide = 0";
-
-        /* Alter the query based on whether we want to show activity item comments in the stream like normal comments or threaded below the activity */
-        if ( !$display_comments || 'threaded' == $display_comments ) {
-            $where_conditions[] = "a.type != 'activity_comment'";
-        }
-
-        $where_sql = 'WHERE ' . join( ' AND ', $where_conditions );
+
+            if ( !empty( $filter['user_id'] ) )
+                $where_sql .= ' OR ';
+            else if ( !empty( $where_conditions ) )
+                $where_sql .= ' AND ';
+
+            $where_sql .= "a.content LIKE '%%" . like_escape( $search_terms ) . "%%'";
+        }
 
         if ( $per_page && $page ) {