Skip to:
Content

BuddyPress.org

Changeset 2844


Ignore:
Timestamp:
03/12/2010 01:34:21 PM (16 years ago)
Author:
apeatling
Message:

Reverting new upgrade code as it is not ready for use yet. This was committed with the previous branch merge by mistake.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/bp-loader.php

    r2842 r2844  
    1313
    1414/***
    15  * Check if this is the first time BuddyPress has been loaded, or the first time
    16  * since an upgrade. If so, load the install/upgrade routine only.
     15 * This file will load in each BuddyPress component based on which
     16 * of the components have been activated on the "BuddyPress" admin menu.
    1717 */
    18 if ( get_site_option( 'bp-db-version' ) < 1210 ) {
    19     require_once( WP_PLUGIN_DIR . '/buddypress/bp-core/bp-core-upgrade.php' );
    2018
    21 /***
    22  * If the install or upgrade routine is completed and everything is up to date
    23  * continue loading BuddyPress as normal.
    24  */
    25 } else {
    26     /***
    27      * This file will load in each BuddyPress component based on which
    28      * of the components have been activated on the "BuddyPress" admin menu.
    29      */
    30     require_once( WP_PLUGIN_DIR . '/buddypress/bp-core.php' );
    31     $bp_deactivated = apply_filters( 'bp_deactivated_components', get_site_option( 'bp-deactivated-components' ) );
     19require_once( WP_PLUGIN_DIR . '/buddypress/bp-core.php' );
     20$bp_deactivated = apply_filters( 'bp_deactivated_components', get_site_option( 'bp-deactivated-components' ) );
    3221
    33     do_action( 'bp_core_loaded' );
     22do_action( 'bp_core_loaded' );
    3423
    35     /* Activity Streams */
    36     if ( !isset( $bp_deactivated['bp-activity.php'] ) && file_exists( BP_PLUGIN_DIR . '/bp-activity.php') )
    37         include( BP_PLUGIN_DIR . '/bp-activity.php' );
     24/* Activity Streams */
     25if ( !isset( $bp_deactivated['bp-activity.php'] ) && file_exists( BP_PLUGIN_DIR . '/bp-activity.php') )
     26    include( BP_PLUGIN_DIR . '/bp-activity.php' );
    3827
    39     /* Blog Tracking */
    40     if ( !isset( $bp_deactivated['bp-blogs.php'] ) && file_exists( BP_PLUGIN_DIR . '/bp-blogs.php') )
    41         include( BP_PLUGIN_DIR . '/bp-blogs.php' );
     28/* Blog Tracking */
     29if ( !isset( $bp_deactivated['bp-blogs.php'] ) && file_exists( BP_PLUGIN_DIR . '/bp-blogs.php') )
     30    include( BP_PLUGIN_DIR . '/bp-blogs.php' );
    4231
    43     /* bbPress Forum Integration */
    44     if ( !isset( $bp_deactivated['bp-forums.php'] ) && file_exists( BP_PLUGIN_DIR . '/bp-forums.php') )
    45         include( BP_PLUGIN_DIR . '/bp-forums.php' );
     32/* bbPress Forum Integration */
     33if ( !isset( $bp_deactivated['bp-forums.php'] ) && file_exists( BP_PLUGIN_DIR . '/bp-forums.php') )
     34    include( BP_PLUGIN_DIR . '/bp-forums.php' );
    4635
    47     /* Friend Connections */
    48     if ( !isset( $bp_deactivated['bp-friends.php'] ) && file_exists( BP_PLUGIN_DIR . '/bp-friends.php') )
    49         include( BP_PLUGIN_DIR . '/bp-friends.php' );
     36/* Friend Connections */
     37if ( !isset( $bp_deactivated['bp-friends.php'] ) && file_exists( BP_PLUGIN_DIR . '/bp-friends.php') )
     38    include( BP_PLUGIN_DIR . '/bp-friends.php' );
    5039
    51     /* Groups Support */
    52     if ( !isset( $bp_deactivated['bp-groups.php'] ) && file_exists( BP_PLUGIN_DIR . '/bp-groups.php') )
    53         include( BP_PLUGIN_DIR . '/bp-groups.php' );
     40/* Groups Support */
     41if ( !isset( $bp_deactivated['bp-groups.php'] ) && file_exists( BP_PLUGIN_DIR . '/bp-groups.php') )
     42    include( BP_PLUGIN_DIR . '/bp-groups.php' );
    5443
    55     /* Private Messaging */
    56     if ( !isset( $bp_deactivated['bp-messages.php'] ) && file_exists( BP_PLUGIN_DIR . '/bp-messages.php') )
    57         include( BP_PLUGIN_DIR . '/bp-messages.php' );
     44/* Private Messaging */
     45if ( !isset( $bp_deactivated['bp-messages.php'] ) && file_exists( BP_PLUGIN_DIR . '/bp-messages.php') )
     46    include( BP_PLUGIN_DIR . '/bp-messages.php' );
    5847
    59     /* Extended Profiles */
    60     if ( !isset( $bp_deactivated['bp-xprofile.php'] ) && file_exists( BP_PLUGIN_DIR . '/bp-xprofile.php') )
    61         include( BP_PLUGIN_DIR . '/bp-xprofile.php' );
     48/* Extended Profiles */
     49if ( !isset( $bp_deactivated['bp-xprofile.php'] ) && file_exists( BP_PLUGIN_DIR . '/bp-xprofile.php') )
     50    include( BP_PLUGIN_DIR . '/bp-xprofile.php' );
    6251
    63     /* Allow dependent plugins to hook into BuddyPress in a safe way */
    64     function bp_loaded() {
    65         do_action( 'bp_init' );
    66     }
    67     add_action( 'plugins_loaded', 'bp_loaded' );
     52/* Allow dependent plugins to hook into BuddyPress in a safe way */
     53function bp_loaded() {
     54    do_action( 'bp_init' );
    6855}
     56add_action( 'plugins_loaded', 'bp_loaded' );
    6957
    7058/* Activation Function */
Note: See TracChangeset for help on using the changeset viewer.