Changeset 8818

Timestamp:

08/12/2014 09:31:40 PM (10 years ago)

Author:

imath

Message:

Do not add "new_member" activities if xProfile component is disabled

In Members component, bp_core_new_user_activity() automatically creates an "xProfile" activity item ("new_member" type) as soon as a user account is activated. If this happens when the xProfile component is disabled, the proper activity action callback is not available, as a result an empty string is saved in the action field of the activity table. On front-end and back-end, these mini activities are displayed without any actions.

This is a temporary fix for 2.1, we will think about something more substantial for 2.2.

See #5807

Location:

trunk/src

Files:

• bp-activity/bp-activity-classes.php (modified) (3 diffs)
• bp-members/bp-members-functions.php (modified) (1 diff)

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

@@ -334 +334 @@
         $where_conditions = array();
 
+        // Excluded types
+        $excluded_types = array();
+
         // Spam
         if ( 'ham_only' == $spam )
@@ -392 +395 @@
         // the activity.
         if ( false === $display_comments || 'threaded' === $display_comments ) {
-            $where_conditions[] = "a.type != 'activity_comment'";
+            $excluded_types[] = 'activity_comment';
         }
 
@@ -398 +401 @@
         // been explicitly set
         if ( empty( $filter['object'] ) ) {
-            $where_conditions[] = "a.type != 'last_activity'";
+            $excluded_types[] = 'last_activity';
+        }
+
+        // Exclude 'new_member' items if xprofile component is not active
+        if ( ! bp_is_active( 'xprofile' ) ) {
+            $excluded_types[] = 'new_member';
+        }
+
+        // Build the excluded type sql part
+        if ( ! empty( $excluded_types ) ) {
+            $not_in = "'" . implode( "', '", esc_sql( $excluded_types ) ) . "'";
+            $where_conditions['excluded_types'] = "a.type NOT IN ({$not_in})";
         }
 

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

@@ -1851 +1851 @@
  */
 function bp_core_new_user_activity( $user ) {
-    if ( empty( $user ) || ! bp_is_active( 'activity' ) ) {
+    if ( empty( $user ) || ! bp_is_active( 'activity' ) || ! bp_is_active( 'xprofile' ) ) {
         return false;
     }