Skip to:
Content

BuddyPress.org

Changeset 5656 for trunk/bp-loader.php


Ignore:
Timestamp:
01/27/2012 09:15:28 PM (12 years ago)
Author:
boonebgorges
Message:

Reconfigures require() order for loading process during installation and upgrade.
Corrects outdated function calls and path names in installation wizard.
See #3740.
Fixes #3875. Fixes #3802. See #3865.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/bp-loader.php

    r5566 r5656  
    447447            $this->is_network_activate = true;
    448448
    449         // Require all of the BuddyPress core libraries
    450         require( $this->plugin_dir . 'bp-core/bp-core-caps.php'       );
    451         require( $this->plugin_dir . 'bp-core/bp-core-cache.php'      );
    452         require( $this->plugin_dir . 'bp-core/bp-core-hooks.php'      );
    453         require( $this->plugin_dir . 'bp-core/bp-core-cssjs.php'      );
    454         require( $this->plugin_dir . 'bp-core/bp-core-update.php'     );
    455         require( $this->plugin_dir . 'bp-core/bp-core-options.php'    );
    456         require( $this->plugin_dir . 'bp-core/bp-core-classes.php'    );
    457         require( $this->plugin_dir . 'bp-core/bp-core-filters.php'    );
    458         require( $this->plugin_dir . 'bp-core/bp-core-avatars.php'    );
    459         require( $this->plugin_dir . 'bp-core/bp-core-widgets.php'    );
    460         require( $this->plugin_dir . 'bp-core/bp-core-template.php'   );
    461         require( $this->plugin_dir . 'bp-core/bp-core-adminbar.php'   );
    462         require( $this->plugin_dir . 'bp-core/bp-core-buddybar.php'   );
    463         require( $this->plugin_dir . 'bp-core/bp-core-catchuri.php'   );
    464         require( $this->plugin_dir . 'bp-core/bp-core-component.php'  );
    465         require( $this->plugin_dir . 'bp-core/bp-core-functions.php'  );
    466         require( $this->plugin_dir . 'bp-core/bp-core-moderation.php' );
    467         require( $this->plugin_dir . 'bp-core/bp-core-loader.php'     );
    468 
    469         // Skip or load deprecated content
    470         if ( false !== $this->load_deprecated ) {
    471             require( $this->plugin_dir . 'bp-core/deprecated/1.5.php' );
    472             require( $this->plugin_dir . 'bp-core/deprecated/1.6.php' );
    473         }
    474 
    475449        /** Update/Install ****************************************************/
    476450
     
    478452        if ( empty( $this->db_version_raw ) ) {
    479453            $this->maintenance_mode = 'install';
     454           
     455            // The installation process requires a few BuddyPress core libraries
     456            require( $this->plugin_dir . 'bp-core/bp-core-functions.php'    );
     457            require( $this->plugin_dir . 'bp-core/bp-core-update.php'       );
     458            require( $this->plugin_dir . 'bp-core/bp-core-caps.php'         );
     459           
    480460            require( $this->plugin_dir . 'bp-core/admin/bp-core-update.php' );
    481461
     
    485465            // Setup the BuddyPress theme directory
    486466            register_theme_directory( $this->themes_dir );
     467           
     468            // Require all of the BuddyPress core libraries
     469            require( $this->plugin_dir . 'bp-core/bp-core-caps.php'       );
     470            require( $this->plugin_dir . 'bp-core/bp-core-cache.php'      );
     471            require( $this->plugin_dir . 'bp-core/bp-core-hooks.php'      );
     472            require( $this->plugin_dir . 'bp-core/bp-core-cssjs.php'      );
     473            require( $this->plugin_dir . 'bp-core/bp-core-update.php'     );
     474            require( $this->plugin_dir . 'bp-core/bp-core-options.php'    );
     475            require( $this->plugin_dir . 'bp-core/bp-core-classes.php'    );
     476            require( $this->plugin_dir . 'bp-core/bp-core-filters.php'    );
     477            require( $this->plugin_dir . 'bp-core/bp-core-avatars.php'    );
     478            require( $this->plugin_dir . 'bp-core/bp-core-widgets.php'    );
     479            require( $this->plugin_dir . 'bp-core/bp-core-template.php'   );
     480            require( $this->plugin_dir . 'bp-core/bp-core-adminbar.php'   );
     481            require( $this->plugin_dir . 'bp-core/bp-core-buddybar.php'   );
     482            require( $this->plugin_dir . 'bp-core/bp-core-catchuri.php'   );
     483            require( $this->plugin_dir . 'bp-core/bp-core-component.php'  );
     484            require( $this->plugin_dir . 'bp-core/bp-core-functions.php'  );
     485            require( $this->plugin_dir . 'bp-core/bp-core-moderation.php' );
     486            require( $this->plugin_dir . 'bp-core/bp-core-loader.php'     );
     487   
     488            // Skip or load deprecated content
     489            if ( false !== $this->load_deprecated ) {
     490                require( $this->plugin_dir . 'bp-core/deprecated/1.5.php' );
     491                require( $this->plugin_dir . 'bp-core/deprecated/1.6.php' );
     492            }
    487493
    488494            // Check if an update is required
Note: See TracChangeset for help on using the changeset viewer.