Ticket #5429: 5429.diff

bp-core/admin/bp-core-components.php

@@ -358 +358 @@
         );
 
         // Optional core components
-        $optional_components = array(
+        $optional_components = apply_filters( 'bp_core_admin_get_optional_components', array(
                 'xprofile' => array(
                         'title'       => __( 'Extended Profiles', 'buddypress' ),
                         'description' => __( 'Customize your community with fully editable profile fields that allow your users to describe themselves.', 'buddypress' )
@@ -395 +395 @@
                         'title'       => __( 'Site Tracking', 'buddypress' ),
                         'description' => __( 'Record activity for new posts and comments from your site.', 'buddypress' )
                 )
-        );
+        ) );
 
 
         // Add blogs tracking if multisite

bp-core/admin/css/common.css

@@ -222 +222 @@
         content: "\f454";
 }
 
+.settings_page_bp-components tr.attachments td.plugin-title span:before {
+        content: "\f128";
+}
+
 /* Settings - Legacy (< WP 3.8) */
 body.branch-3-6.settings_page_bp-components tr.activity td.plugin-title span:before,
 body.branch-3-6.settings_page_bp-components tr.notifications td.plugin-title span:before,

bp-core/bp-core-avatars.php

@@ -764 +764 @@
                 $new_avatar_path      = str_replace( $upload_dir['basedir'], '', $original_file );
 
                 if ( $existing_avatar_path !== $new_avatar_path ) {
-                        bp_core_delete_existing_avatar( array( 'object' => $object, 'avatar_path' => $avatar_folder_dir ) );
+                        bp_core_delete_existing_avatar( array( 'object' => $object, 'item_id' => $item_id,'avatar_path' => $avatar_folder_dir ) );
                 }
         }
 

bp-core/bp-core-caps.php

@@ -191 +191 @@
         if ( empty( $blog_id ) )
                 $blog_id = bp_get_root_blog_id();
 
-        $retval = current_user_can_for_blog( $blog_id, $capability );
+        $args = array_slice( func_get_args(), 2 );
+        $args = array_merge( array( $blog_id, $capability ), $args );
+
+        $retval = call_user_func_array( 'current_user_can_for_blog', $args );
 
         return (bool) apply_filters( 'bp_current_user_can', $retval, $capability, $blog_id );
 }

bp-core/bp-core-loader.php

@@ -108 +108 @@
                         }
                 }
 
+                do_action( 'bp_core_components_included', $bp->active_components );
+
                 // Add Core to required components
                 $bp->required_components[] = 'core';
         }