Skip to:
Content

BuddyPress.org

Ticket #5429: 5429.diff

File 5429.diff, 3.1 KB (added by imath, 6 years ago)
  • bp-core/admin/bp-core-components.php

    diff --git bp-core/admin/bp-core-components.php bp-core/admin/bp-core-components.php
    index bca1c39..c5343b4 100644
    function bp_core_admin_get_components( $type = 'all' ) { 
    358358        );
    359359
    360360        // Optional core components
    361         $optional_components = array(
     361        $optional_components = apply_filters( 'bp_core_admin_get_optional_components', array(
    362362                'xprofile' => array(
    363363                        'title'       => __( 'Extended Profiles', 'buddypress' ),
    364364                        'description' => __( 'Customize your community with fully editable profile fields that allow your users to describe themselves.', 'buddypress' )
    function bp_core_admin_get_components( $type = 'all' ) { 
    395395                        'title'       => __( 'Site Tracking', 'buddypress' ),
    396396                        'description' => __( 'Record activity for new posts and comments from your site.', 'buddypress' )
    397397                )
    398         );
     398        ) );
    399399
    400400
    401401        // Add blogs tracking if multisite
  • bp-core/admin/css/common.css

    diff --git bp-core/admin/css/common.css bp-core/admin/css/common.css
    index 17548ec..402e3eb 100644
    body.branch-3-7 #adminmenu li.toplevel_page_bp-general-settings .wp-menu-image { 
    222222        content: "\f454";
    223223}
    224224
     225.settings_page_bp-components tr.attachments td.plugin-title span:before {
     226        content: "\f128";
     227}
     228
    225229/* Settings - Legacy (< WP 3.8) */
    226230body.branch-3-6.settings_page_bp-components tr.activity td.plugin-title span:before,
    227231body.branch-3-6.settings_page_bp-components tr.notifications td.plugin-title span:before,
  • bp-core/bp-core-avatars.php

    diff --git bp-core/bp-core-avatars.php bp-core/bp-core-avatars.php
    index a6e638f..d7f6074 100644
    function bp_core_avatar_handle_crop( $args = '' ) { 
    764764                $new_avatar_path      = str_replace( $upload_dir['basedir'], '', $original_file );
    765765
    766766                if ( $existing_avatar_path !== $new_avatar_path ) {
    767                         bp_core_delete_existing_avatar( array( 'object' => $object, 'avatar_path' => $avatar_folder_dir ) );
     767                        bp_core_delete_existing_avatar( array( 'object' => $object, 'item_id' => $item_id,'avatar_path' => $avatar_folder_dir ) );
    768768                }
    769769        }
    770770
  • bp-core/bp-core-caps.php

    diff --git bp-core/bp-core-caps.php bp-core/bp-core-caps.php
    index 2ed693d..1f3defb 100644
    function bp_current_user_can( $capability, $blog_id = 0 ) { 
    191191        if ( empty( $blog_id ) )
    192192                $blog_id = bp_get_root_blog_id();
    193193
    194         $retval = current_user_can_for_blog( $blog_id, $capability );
     194        $args = array_slice( func_get_args(), 2 );
     195        $args = array_merge( array( $blog_id, $capability ), $args );
     196
     197        $retval = call_user_func_array( 'current_user_can_for_blog', $args );
    195198
    196199        return (bool) apply_filters( 'bp_current_user_can', $retval, $capability, $blog_id );
    197200}
  • bp-core/bp-core-loader.php

    diff --git bp-core/bp-core-loader.php bp-core/bp-core-loader.php
    index 7dd0f51..e99db91 100644
    class BP_Core extends BP_Component { 
    108108                        }
    109109                }
    110110
     111                do_action( 'bp_core_components_included', $bp->active_components );
     112
    111113                // Add Core to required components
    112114                $bp->required_components[] = 'core';
    113115        }