Skip to:
Content

BuddyPress.org

Changeset 10207


Ignore:
Timestamp:
10/07/2015 05:04:11 PM (5 years ago)
Author:
imath
Message:

BuddyPress Uploader: Make sure to extend the window.bp global instead of resetting it.

Props DJPaul

Fixes #6574

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/bp-core/js/bp-plupload.js

    r10206 r10207  
    1111    }
    1212
    13     // Set the bp global by only getting what we need from the wp one.
    14     window.bp = _.pick( window.wp, 'Backbone', 'ajax', 'template' );
     13    /**
     14     * Extend the bp global with what we need from the wp one.
     15     * and make sure previously defined BuddyPress attributes
     16     * are not removed (eg: bp.mentions)
     17     */
     18    _.extend( bp, _.pick( wp, 'Backbone', 'ajax', 'template' ) );
    1519
    1620    // Init Models, Collections, Views and the BuddyPress Uploader
Note: See TracChangeset for help on using the changeset viewer.