Skip to:
Content

BuddyPress.org

Changeset 1303


Ignore:
Timestamp:
04/03/2009 12:57:45 PM (13 years ago)
Author:
apeatling
Message:

Making the switch to WPMU 2.7.1+ support only. BuddyPress will now ONLY run in /plugins/ and not /mu-plugins/.

You should install all BuddyPress component plugin files in /wp-content/plugins/buddypress/ however you can call the "buddypress" dir anything you like. BuddyPress plugins can then be activated and deactivated through the "Plugins" admin panel.

If you are upgrading to this version please move all BuddyPress plugins to the location mentioned above and then update. You will also need to make sure your themes reference the new locations. There are two constants you should use "BP_PLUGIN_DIR" and "BP_PLUGIN_URL". You will need to re-activate the plugins via the "Plugins" admin panel.

Again, from now on BuddyPress will ONLY work with WPMU 2.7.1+ so please use the 2.7 branch from the WordPress MU SVN repo. Link: ​http://trac.mu.wordpress.org/browser/branches/2.7

Location:
trunk
Files:
32 edited

Legend:

Unmodified
Added
Removed

  • trunk/bp-activity.php

    r1270 r1303  
    55Description: Activates activity streams for all users, plus a site-wide activity stream.
    66Author: BuddyPress
    7 Version: 1.0-RC1
     7Version: 1.0-RC2
    88Author URI: http://buddypress.org
    99Site Wide Only: true
    … …  
    1313
    1414define ( 'BP_ACTIVITY_IS_INSTALLED', 1 );
    15 define ( 'BP_ACTIVITY_VERSION', '1.0-RC1' );
    16 define ( 'BP_ACTIVITY_DB_VERSION', '1211' );
     15define ( 'BP_ACTIVITY_VERSION', '1.0-RC2' );
     16define ( 'BP_ACTIVITY_DB_VERSION', '1300' );
    1717
    1818/* Define the slug for the component */
    … …  
    128128    $bp->activity->table_name_sitewide = $wpdb->base_prefix . 'bp_activity_sitewide';
    129129   
    130     $bp->activity->image_base = WPMU_PLUGIN_URL . '/bp-activity/images';
     130    $bp->activity->image_base = BP_PLUGIN_URL . '/bp-activity/images';
    131131    $bp->activity->slug = BP_ACTIVITY_SLUG;
    132132   

  • trunk/bp-activity/bp-activity-cssjs.php

    r1209 r1303  
    33function bp_activity_add_structure_css() {
    44    /* Enqueue the structure CSS file to give basic positional formatting for components */
    5     wp_enqueue_style( 'bp-activity-structure', WPMU_PLUGIN_URL . '/bp-activity/css/structure.css' );   
     5    wp_enqueue_style( 'bp-activity-structure', BP_PLUGIN_URL . '/bp-activity/css/structure.css' ); 
    66}
    77add_action( 'bp_styles', 'bp_activity_add_structure_css' );

  • trunk/bp-activity/bp-activity-widgets.php

    r1250 r1303  
    1010
    1111    if ( is_active_widget( 'bp_activity_widget_sitewide_activity' ) ) {
    12         wp_enqueue_style( 'bp-activity-widget-activity-css', WPMU_PLUGIN_URL . '/bp-activity/css/widget-activity.css' );       
     12        wp_enqueue_style( 'bp-activity-widget-activity-css', BP_PLUGIN_URL . '/bp-activity/css/widget-activity.css' );     
    1313    }
    1414}

  • trunk/bp-blogs.php

    r1296 r1303  
    55Description: Tracks blogs, blog posts and blogs comments for a user across a WPMU installation.
    66Author: BuddyPress
    7 Version: 1.0-RC1
     7Version: 1.0-RC2
    88Author URI: http://buddypress.org
    99Site Wide Only: true
    … …  
    1212require_once( 'bp-core.php' );
    1313
    14 define ( 'BP_BLOGS_VERSION', '1.0-RC1' );
    15 define ( 'BP_BLOGS_DB_VERSION', '937' );
     14define ( 'BP_BLOGS_VERSION', '1.0-RC2' );
     15define ( 'BP_BLOGS_DB_VERSION', '1300' );
    1616
    1717/* Define the slug for the component */
    … …  
    148148    $bp->blogs->format_activity_function = 'bp_blogs_format_activity';
    149149    $bp->blogs->format_notification_function = 'bp_blogs_format_notifications';
    150     $bp->blogs->image_base = WPMU_PLUGIN_URL . '/bp-groups/images';
     150    $bp->blogs->image_base = BP_PLUGIN_URL . '/bp-groups/images';
    151151    $bp->blogs->slug = BP_BLOGS_SLUG;
    152152
    … …  
    210210        $bp->is_directory = true;
    211211
    212         wp_enqueue_script( 'bp-blogs-directory-blogs', WPMU_PLUGIN_URL . '/bp-blogs/js/directory-blogs.js', array( 'jquery', 'jquery-livequery-pack' ) );
     212        wp_enqueue_script( 'bp-blogs-directory-blogs', BP_PLUGIN_URL . '/bp-blogs/js/directory-blogs.js', array( 'jquery', 'jquery-livequery-pack' ) );
    213213        bp_core_load_template( 'directories/blogs/index' );
    214214    }

  • trunk/bp-blogs/bp-blogs-cssjs.php

    r1209 r1303  
    33function bp_blogs_add_structure_css() {
    44    /* Enqueue the structure CSS file to give basic positional formatting for components */
    5     wp_enqueue_style( 'bp-blogs-structure', WPMU_PLUGIN_URL . '/bp-blogs/css/structure.css' ); 
     5    wp_enqueue_style( 'bp-blogs-structure', BP_PLUGIN_URL . '/bp-blogs/css/structure.css' );   
    66}
    77add_action( 'bp_styles', 'bp_blogs_add_structure_css' );

  • trunk/bp-blogs/bp-blogs-widgets.php

    r1250 r1303  
    1010
    1111    if ( is_active_widget( 'bp_blogs_widget_recent_posts' ) ) {
    12         wp_enqueue_style( 'bp-blogs-widget-posts-css', WPMU_PLUGIN_URL . '/bp-blogs/css/widget-blogs.css' );       
     12        wp_enqueue_style( 'bp-blogs-widget-posts-css', BP_PLUGIN_URL . '/bp-blogs/css/widget-blogs.css' );     
    1313    }
    1414}

  • trunk/bp-core.php

    r1302 r1303  
    55Description: This plugin must be activated when using any other BuddyPress plugins.
    66Author: BuddyPress
    7 Version: 1.0-RC1
     7Version: 1.0-RC2
    88Author URI: http://buddypress.org
    99Site Wide Only: true
    1010*/
    1111
     12/* Define the current version number for checking if DB tables are up to date. */
     13define( 'BP_CORE_VERSION', '1.0-RC2' );
     14define( 'BP_CORE_DB_VERSION', '1300' );
     15
     16/* Define the path and url of the BuddyPress plugins directory */
     17$bpdir = array_pop( explode( '/', dirname(__FILE__) ) );
     18define( 'BP_PLUGIN_DIR', WP_PLUGIN_DIR . '/' . $bpdir );
     19define( 'BP_PLUGIN_URL', WP_PLUGIN_URL . '/' . $bpdir );
     20
    1221/* Place your custom code (actions/filters) in a file called bp-custom.php and it will be loaded before anything else. */
    13 if ( file_exists( WPMU_PLUGIN_DIR . '/bp-custom.php' ) )
    14     require( WPMU_PLUGIN_DIR . '/bp-custom.php' );
    15 
    16 /* Define the current version number for checking if DB tables are up to date. */
    17 define( 'BP_CORE_VERSION', '1.0-RC1' );
    18 define( 'BP_CORE_DB_VERSION', '1031' );
     22if ( file_exists( BP_PLUGIN_DIR . '/bp-custom.php' ) )
     23    require( BP_PLUGIN_DIR . '/bp-custom.php' );
    1924
    2025/* Define on which blog ID BuddyPress should run */
    … …  
    3035
    3136/* Load the language file */
    32 if ( file_exists( WPMU_PLUGIN_DIR . '/bp-languages/buddypress-' . get_locale() . '.mo' ) )
    33     load_textdomain( 'buddypress', WPMU_PLUGIN_DIR . '/bp-languages/buddypress-' . get_locale() . '.mo' );
     37if ( file_exists( BP_PLUGIN_DIR . '/bp-languages/buddypress-' . get_locale() . '.mo' ) )
     38    load_textdomain( 'buddypress', BP_PLUGIN_DIR . '/bp-languages/buddypress-' . get_locale() . '.mo' );
    3439
    3540/* Load the files containing functions that we globally will need. */
    … …  
    154159    $bp->is_item_mod = false;
    155160   
    156     $bp->core->image_base = WPMU_PLUGIN_URL . '/bp-core/images';
     161    $bp->core->image_base = BP_PLUGIN_URL . '/bp-core/images';
    157162    $bp->core->table_name_notifications = $wpdb->base_prefix . 'bp_notifications';
    158163   
    … …  
    336341        $bp->current_component = false;
    337342
    338         wp_enqueue_script( 'bp-core-directory-members', WPMU_PLUGIN_URL . '/bp-core/js/directory-members.js', array( 'jquery', 'jquery-livequery-pack' ) );
     343        wp_enqueue_script( 'bp-core-directory-members', BP_PLUGIN_URL . '/bp-core/js/directory-members.js', array( 'jquery', 'jquery-livequery-pack' ) );
    339344        bp_core_load_template( 'directories/members/index' );
    340345    }
    … …  
    11751180                unset($nav_array[$key]);
    11761181            break;
    1177             case $bp->account->slug:
    1178                 $new_nav[8] = $nav_array[$key];
    1179                 unset($nav_array[$key]);
    1180             break;
    11811182        }
    11821183    }
    1183    
     1184
    11841185    if ( is_array( $new_nav ) ) {
    11851186        /* Sort the navigation array by key */

  • trunk/bp-core/bp-core-admin.php

    r1209 r1303  
    9494                        <p><?php _e( 'For users without a custom avatar of their own, you can either display a generic logo or a generated one based on their email address', 'buddypress' ) ?></p>
    9595
    96                         <label><input name="bp-admin[user-avatar-default]" id="avatar_mystery" value="mystery" type="radio" <?php if ( get_site_option( 'user-avatar-default' ) == 'mystery' ) : ?> checked="checked"<?php endif; ?> /> &nbsp;<img alt="" src="http://www.gravatar.com/avatar/<?php md5( $ud->user_email ) ?>&amp;?s=32&amp;d=<?php echo WPMU_PLUGIN_URL . '/bp-core/images/mystery-man.jpg' ?>&amp;r=PG&amp;forcedefault=1" class="avatar avatar-32" height="32" width="32"> &nbsp;<?php _e( 'Mystery Man', 'buddypress' ) ?></label><br>
     96                        <label><input name="bp-admin[user-avatar-default]" id="avatar_mystery" value="mystery" type="radio" <?php if ( get_site_option( 'user-avatar-default' ) == 'mystery' ) : ?> checked="checked"<?php endif; ?> /> &nbsp;<img alt="" src="http://www.gravatar.com/avatar/<?php md5( $ud->user_email ) ?>&amp;?s=32&amp;d=<?php echo BP_PLUGIN_URL . '/bp-core/images/mystery-man.jpg' ?>&amp;r=PG&amp;forcedefault=1" class="avatar avatar-32" height="32" width="32"> &nbsp;<?php _e( 'Mystery Man', 'buddypress' ) ?></label><br>
    9797                        <label><input name="bp-admin[user-avatar-default]" id="avatar_identicon" value="identicon" type="radio" <?php if ( get_site_option( 'user-avatar-default' ) == 'identicon' ) : ?> checked="checked"<?php endif; ?> /> &nbsp;<img alt="" src="http://www.gravatar.com/avatar/<?php md5( $ud->user_email ) ?>?s=32&amp;d=identicon&amp;r=PG&amp;forcedefault=1" class="avatar avatar-32" height="32" width="32"> &nbsp;<?php _e( 'Identicon (Generated)', 'buddypress' ) ?></label><br>
    9898                        <label><input name="bp-admin[user-avatar-default]" id="avatar_wavatar" value="wavatar" type="radio" <?php if ( get_site_option( 'user-avatar-default' ) == 'wavatar' ) : ?> checked="checked"<?php endif; ?> /> &nbsp;<img alt="" src="http://www.gravatar.com/avatar/<?php md5( $ud->user_email ) ?>?s=32&amp;d=wavatar&amp;r=PG&amp;forcedefault=1" class="avatar avatar-32" height="32" width="32"> &nbsp;<?php _e( 'Wavatar (Generated)', 'buddypress' ) ?> </label><br>

  • trunk/bp-core/bp-core-adminbar.php

    r1273 r1303  
    2727    global $bp;
    2828   
    29     echo '<a href="' . $bp->root_domain . '"><img id="admin-bar-logo" src="' . apply_filters( 'bp_admin_bar_logo_src', WPMU_PLUGIN_URL . '/bp-core/images/admin_bar_logo.gif' ) . '" alt="' . apply_filters( 'bp_admin_bar_logo_alt_text', __( 'BuddyPress', 'buddypress' ) ) . '" /></a>';
     29    echo '<a href="' . $bp->root_domain . '"><img id="admin-bar-logo" src="' . apply_filters( 'bp_admin_bar_logo_src', BP_PLUGIN_URL . '/bp-core/images/admin_bar_logo.gif' ) . '" alt="' . apply_filters( 'bp_admin_bar_logo_alt_text', __( 'BuddyPress', 'buddypress' ) ) . '" /></a>';
    3030}
    3131

  • trunk/bp-core/bp-core-avatars.php

    r1286 r1303  
    1616define( 'CORE_CROPPING_CANVAS_MAX', apply_filters( 'bp_core_avatar_cropping_canvas_max', 450 ) );
    1717define( 'CORE_MAX_FILE_SIZE', get_site_option('fileupload_maxk') * 1024 );
    18 define( 'CORE_DEFAULT_AVATAR', apply_filters( 'bp_core_avatar_default_src', WPMU_PLUGIN_URL . '/bp-xprofile/images/none.gif' ) );
    19 define( 'CORE_DEFAULT_AVATAR_THUMB', apply_filters( 'bp_core_avatar_default_thumb_src', WPMU_PLUGIN_URL . '/bp-xprofile/images/none-thumbnail.gif' ) );
     18define( 'CORE_DEFAULT_AVATAR', apply_filters( 'bp_core_avatar_default_src', BP_PLUGIN_URL . '/bp-xprofile/images/none.gif' ) );
     19define( 'CORE_DEFAULT_AVATAR_THUMB', apply_filters( 'bp_core_avatar_default_thumb_src', BP_PLUGIN_URL . '/bp-xprofile/images/none-thumbnail.gif' ) );
    2020
    2121function bp_core_get_avatar( $user, $version = 1, $width = null, $height = null, $no_tag = false ) {
    … …  
    4949            $default_grav = 'wavatar';
    5050        } else if ( 'mystery' == $grav_option ) {
    51             $default_grav = WPMU_PLUGIN_URL . '/bp-core/images/mystery-man.jpg';
     51            $default_grav = BP_PLUGIN_URL . '/bp-core/images/mystery-man.jpg';
    5252        } else {
    5353            $default_grav = $grav_option;

  • trunk/bp-core/bp-core-cssjs.php

    r1270 r1303  
    1111function bp_core_add_js() {
    1212    wp_enqueue_script( 'jquery' );
    13     wp_enqueue_script( 'jquery-livequery-pack', WPMU_PLUGIN_URL . '/bp-core/js/jquery/jquery.livequery.pack.js', 'jquery' );
    14     wp_enqueue_script( 'bp-general-js', WPMU_PLUGIN_URL . '/bp-core/js/general.js' );
     13    wp_enqueue_script( 'jquery-livequery-pack', BP_PLUGIN_URL . '/bp-core/js/jquery/jquery.livequery.pack.js', 'jquery' );
     14    wp_enqueue_script( 'bp-general-js', BP_PLUGIN_URL . '/bp-core/js/general.js' );
    1515}
    1616add_action( 'wp', 'bp_core_add_js' );
    … …  
    2727function bp_core_add_ajax_js() {
    2828    echo
    29 '<script type="text/javascript">var ajaxurl = "' . WPMU_PLUGIN_URL . '/bp-core/bp-core-ajax-handler.php";</script>
     29'<script type="text/javascript">var ajaxurl = "' . BP_PLUGIN_URL . '/bp-core/bp-core-ajax-handler.php";</script>
    3030';
    3131}
    … …  
    6262       
    6363    if ( is_user_logged_in() || ( (int)get_site_option( 'show-loggedout-adminbar' ) && !is_user_logged_in() ) ) {
    64         wp_enqueue_style( 'bp-admin-bar', WPMU_PLUGIN_URL . '/bp-core/css/admin-bar.css' );
     64        wp_enqueue_style( 'bp-admin-bar', BP_PLUGIN_URL . '/bp-core/css/admin-bar.css' );
    6565       
    66         if ( 'rtl' == get_bloginfo('text_direction') && file_exists( WPMU_PLUGIN_DIR . '/bp-core/css/admin-bar-rtl.css' ) )
    67             wp_enqueue_style( 'bp-admin-bar-rtl', WPMU_PLUGIN_URL . '/bp-core/css/admin-bar-rtl.css' );
     66        if ( 'rtl' == get_bloginfo('text_direction') && file_exists( BP_PLUGIN_DIR . '/bp-core/css/admin-bar-rtl.css' ) )
     67            wp_enqueue_style( 'bp-admin-bar-rtl', BP_PLUGIN_URL . '/bp-core/css/admin-bar-rtl.css' );   
    6868    }
    6969    wp_print_styles();
    … …  
    8181function bp_core_add_structure_css() {
    8282    /* Enqueue the structure CSS file to give basic positional formatting for components */
    83     wp_enqueue_style( 'bp-core-structure', WPMU_PLUGIN_URL . '/bp-core/css/structure.css' );   
     83    wp_enqueue_style( 'bp-core-structure', BP_PLUGIN_URL . '/bp-core/css/structure.css' ); 
    8484}
    8585add_action( 'bp_styles', 'bp_core_add_structure_css' );
    … …  
    9595function bp_core_add_admin_js() {
    9696    if ( false !== strpos( $_GET['page'], 'bp-core' ) ) {
    97         wp_enqueue_script( 'bp-account-admin-js', WPMU_PLUGIN_URL . '/bp-core/js/account-admin.js' );
     97        wp_enqueue_script( 'bp-account-admin-js', BP_PLUGIN_URL . '/bp-core/js/account-admin.js' );
    9898    }
    9999   
    … …  
    116116        return false;
    117117       
    118     wp_enqueue_style( 'bp-admin-bar', WPMU_PLUGIN_URL . '/bp-core/css/admin-bar.css' );
     118    wp_enqueue_style( 'bp-admin-bar', BP_PLUGIN_URL . '/bp-core/css/admin-bar.css' );
    119119}
    120120add_action( 'admin_menu', 'bp_core_add_admin_css' );

  • trunk/bp-core/bp-core-widgets.php

    r1273 r1303  
    1515    /* Include the javascript needed for activated widgets only */
    1616    if ( is_active_widget( 'bp_core_widget_members' ) ) {
    17         wp_enqueue_script( 'bp_core_widget_members-js', WPMU_PLUGIN_URL . '/bp-core/js/widget-members.js', array('jquery', 'jquery-livequery-pack') );     
    18         wp_enqueue_style( 'bp_core_widget_members-css', WPMU_PLUGIN_URL . '/bp-core/css/widget-members.css' );
     17        wp_enqueue_script( 'bp_core_widget_members-js', BP_PLUGIN_URL . '/bp-core/js/widget-members.js', array('jquery', 'jquery-livequery-pack') );       
     18        wp_enqueue_style( 'bp_core_widget_members-css', BP_PLUGIN_URL . '/bp-core/css/widget-members.css' );
    1919    }
    2020   

  • trunk/bp-forums.php

    r1270 r1303  
    55Description: Activates bbPress forum support within BuddyPress groups or any other custom component.
    66Author: BuddyPress
    7 Version: 1.0-RC1
     7Version: 1.0-RC2
    88Author URI: http://buddypress.org
    99Site Wide Only: true
    … …  
    1818require_once( 'bp-core.php' );
    1919
    20 define ( 'BP_FORUMS_VERSION', '1.0-RC1' );
     20define ( 'BP_FORUMS_VERSION', '1.0-RC2' );
    2121
    2222/* Define the parent forum ID */

  • trunk/bp-friends.php

    r1290 r1303  
    55Description: Allows the creation of friend connections between users.
    66Author: BuddyPress
    7 Version: 1.0-RC1
     7Version: 1.0-RC2
    88Author URI: http://buddypress.org
    99Site Wide Only: true
    … …  
    1313
    1414define ( 'BP_FRIENDS_IS_INSTALLED', 1 );
    15 define ( 'BP_FRIENDS_VERSION', '1.0-RC1' );
    16 define ( 'BP_FRIENDS_DB_VERSION', '937' );
     15define ( 'BP_FRIENDS_VERSION', '1.0-RC2' );
     16define ( 'BP_FRIENDS_DB_VERSION', '1300' );
    1717
    1818/* Define the slug for the component */
    … …  
    6767   
    6868    $bp->friends->table_name = $wpdb->base_prefix . 'bp_friends';
    69     $bp->friends->image_base = WPMU_PLUGIN_URL . '/bp-friends/images';
     69    $bp->friends->image_base = BP_PLUGIN_URL . '/bp-friends/images';
    7070    $bp->friends->format_activity_function = 'friends_format_activity';
    7171    $bp->friends->format_notification_function = 'friends_format_notifications';

  • trunk/bp-friends/bp-friends-cssjs.php

    r1209 r1303  
    1010
    1111    if ( $bp->current_component == $bp->friends->slug )
    12         wp_enqueue_script( 'bp-friends-js', WPMU_PLUGIN_URL . '/bp-friends/js/general.js' );
     12        wp_enqueue_script( 'bp-friends-js', BP_PLUGIN_URL . '/bp-friends/js/general.js' );
    1313}
    1414add_action( 'template_redirect', 'friends_add_js', 1 );
    … …  
    1616function friends_add_structure_css() {
    1717    /* Enqueue the structure CSS file to give basic positional formatting for components */
    18     wp_enqueue_style( 'bp-friends-structure', WPMU_PLUGIN_URL . '/bp-friends/css/structure.css' ); 
     18    wp_enqueue_style( 'bp-friends-structure', BP_PLUGIN_URL . '/bp-friends/css/structure.css' );   
    1919}
    2020add_action( 'bp_styles', 'friends_add_structure_css' );

  • trunk/bp-groups.php

    r1293 r1303  
    55Description: Allows users to create, join and participate in groups.
    66Author: BuddyPress
    7 Version: 1.0-RC1
     7Version: 1.0-RC2
    88Author URI: http://buddypress.org
    99Site Wide Only: true
    … …  
    1313
    1414define ( 'BP_GROUPS_IS_INSTALLED', 1 );
    15 define ( 'BP_GROUPS_VERSION', '1.0-RC1' );
    16 define ( 'BP_GROUPS_DB_VERSION', '951' );
     15define ( 'BP_GROUPS_VERSION', '1.0-RC2' );
     16define ( 'BP_GROUPS_DB_VERSION', '1300' );
    1717
    1818/* Define the slug for the component */
    … …  
    140140    $bp->groups->table_name_members = $wpdb->base_prefix . 'bp_groups_members';
    141141    $bp->groups->table_name_groupmeta = $wpdb->base_prefix . 'bp_groups_groupmeta';
    142     $bp->groups->image_base = WPMU_PLUGIN_URL . '/bp-groups/images';
     142    $bp->groups->image_base = BP_PLUGIN_URL . '/bp-groups/images';
    143143    $bp->groups->format_activity_function = 'groups_format_activity';
    144144    $bp->groups->format_notification_function = 'groups_format_notifications';
    … …  
    313313        $bp->is_directory = true;
    314314
    315         wp_enqueue_script( 'bp-groups-directory-groups', WPMU_PLUGIN_URL . '/bp-groups/js/directory-groups.js', array( 'jquery', 'jquery-livequery-pack' ) );
     315        wp_enqueue_script( 'bp-groups-directory-groups', BP_PLUGIN_URL . '/bp-groups/js/directory-groups.js', array( 'jquery', 'jquery-livequery-pack' ) );
    316316        bp_core_load_template( 'directories/groups/index' );
    317317    }

  • trunk/bp-groups/bp-groups-cssjs.php

    r1209 r1303  
    1010
    1111    if ( $bp->current_component == $bp->groups->slug )
    12         wp_enqueue_script( 'bp-groups-js', WPMU_PLUGIN_URL . '/bp-groups/js/general.js' );
     12        wp_enqueue_script( 'bp-groups-js', BP_PLUGIN_URL . '/bp-groups/js/general.js' );
    1313}
    1414add_action( 'template_redirect', 'groups_add_js', 1 );
    … …  
    1616function groups_add_structure_css() {
    1717    /* Enqueue the structure CSS file to give basic positional formatting for components */
    18     wp_enqueue_style( 'bp-groups-structure', WPMU_PLUGIN_URL . '/bp-groups/css/structure.css' );   
     18    wp_enqueue_style( 'bp-groups-structure', BP_PLUGIN_URL . '/bp-groups/css/structure.css' ); 
    1919}
    2020add_action( 'bp_styles', 'groups_add_structure_css' );

  • trunk/bp-groups/bp-groups-widgets.php

    r1250 r1303  
    1111    /* Include the javascript needed for activated widgets only */
    1212    if ( is_active_widget( 'groups_widget_groups_list' ) ) {
    13         wp_enqueue_script( 'groups_widget_groups_list-js', WPMU_PLUGIN_URL . '/bp-groups/js/widget-groups.js', array('jquery', 'jquery-livequery-pack') );     
    14         wp_enqueue_style( 'groups_widget_members-css', WPMU_PLUGIN_URL . '/bp-groups/css/widget-groups.css' );     
     13        wp_enqueue_script( 'groups_widget_groups_list-js', BP_PLUGIN_URL . '/bp-groups/js/widget-groups.js', array('jquery', 'jquery-livequery-pack') );       
     14        wp_enqueue_style( 'groups_widget_members-css', BP_PLUGIN_URL . '/bp-groups/css/widget-groups.css' );       
    1515    }
    1616}

  • trunk/bp-messages.php

    r1284 r1303  
    55Description: Enables the ability for users to send private messages to one another. Site admins can send site notices.
    66Author: BuddyPress
    7 Version: 1.0-RC1
     7Version: 1.0-RC2
    88Author URI: http://buddypress.org
    99Site Wide Only: true
    … …  
    1313
    1414define ( 'BP_MESSAGES_IS_INSTALLED', 1 );
    15 define ( 'BP_MESSAGES_VERSION', '1.0-RC1' );
    16 define ( 'BP_MESSAGES_DB_VERSION', '948' );
     15define ( 'BP_MESSAGES_VERSION', '1.0-RC2' );
     16define ( 'BP_MESSAGES_DB_VERSION', '1300' );
    1717
    1818/* Define the slug for the component */
    … …  
    113113    $bp->messages->format_activity_function = 'messages_format_activity';
    114114    $bp->messages->format_notification_function = 'messages_format_notifications';
    115     $bp->messages->image_base = WPMU_PLUGIN_URL . '/bp-messages/images';
     115    $bp->messages->image_base = BP_PLUGIN_URL . '/bp-messages/images';
    116116    $bp->messages->slug = BP_MESSAGES_SLUG;
    117117

  • trunk/bp-messages/bp-messages-cssjs.php

    r1209 r1303  
    55
    66    if ( $bp->current_component == $bp->messages->slug )
    7         wp_enqueue_script( 'bp-messages-js', WPMU_PLUGIN_URL . '/bp-messages/js/general.php' );
     7        wp_enqueue_script( 'bp-messages-js', BP_PLUGIN_URL . '/bp-messages/js/general.php' );
    88
    99    // Include the autocomplete JS for composing a message.
    1010    if ( $bp->current_component == $bp->messages->slug && $bp->current_action == 'compose') {
    11         wp_enqueue_script( 'bp-jquery-autocomplete', WPMU_PLUGIN_URL . '/bp-messages/js/autocomplete/jquery.autocomplete.js', 'jquery' );
    12         wp_enqueue_script( 'bp-jquery-autocomplete-fb', WPMU_PLUGIN_URL . '/bp-messages/js/autocomplete/jquery.autocompletefb.js', 'jquery' );
    13         wp_enqueue_script( 'bp-jquery-bgiframe', WPMU_PLUGIN_URL . '/bp-messages/js/autocomplete/jquery.bgiframe.min.js', 'jquery' );
    14         wp_enqueue_script( 'bp-jquery-dimensions', WPMU_PLUGIN_URL . '/bp-messages/js/autocomplete/jquery.dimensions.js', 'jquery' );   
    15         wp_enqueue_script( 'bp-autocomplete-init', WPMU_PLUGIN_URL . '/bp-messages/js/autocomplete/init.php', 'jquery' );   
     11        wp_enqueue_script( 'bp-jquery-autocomplete', BP_PLUGIN_URL . '/bp-messages/js/autocomplete/jquery.autocomplete.js', 'jquery' );
     12        wp_enqueue_script( 'bp-jquery-autocomplete-fb', BP_PLUGIN_URL . '/bp-messages/js/autocomplete/jquery.autocompletefb.js', 'jquery' );
     13        wp_enqueue_script( 'bp-jquery-bgiframe', BP_PLUGIN_URL . '/bp-messages/js/autocomplete/jquery.bgiframe.min.js', 'jquery' );
     14        wp_enqueue_script( 'bp-jquery-dimensions', BP_PLUGIN_URL . '/bp-messages/js/autocomplete/jquery.dimensions.js', 'jquery' );
     15        wp_enqueue_script( 'bp-autocomplete-init', BP_PLUGIN_URL . '/bp-messages/js/autocomplete/init.php', 'jquery' );
    1616
    1717    }
    … …  
    2424   
    2525    if ( $bp->current_component == $bp->messages->slug && $bp->current_action == 'compose') {
    26         wp_enqueue_style( 'bp-messages-autocomplete', WPMU_PLUGIN_URL . '/bp-messages/css/autocomplete/jquery.autocompletefb.css' );   
     26        wp_enqueue_style( 'bp-messages-autocomplete', BP_PLUGIN_URL . '/bp-messages/css/autocomplete/jquery.autocompletefb.css' ); 
    2727        wp_print_styles();
    2828    }
    … …  
    3333function messages_add_structure_css() {
    3434    /* Enqueue the structure CSS file to give basic positional formatting for components */
    35     wp_enqueue_style( 'bp-messages-structure', WPMU_PLUGIN_URL . '/bp-messages/css/structure.css' );   
     35    wp_enqueue_style( 'bp-messages-structure', BP_PLUGIN_URL . '/bp-messages/css/structure.css' ); 
    3636}
    3737add_action( 'bp_styles', 'messages_add_structure_css' );

  • trunk/bp-messages/js/autocomplete/init.php

    r1209 r1303  
    77jQuery(document).ready(function() {
    88    var acfb =
    9     jQuery("ul.first").autoCompletefb({urlLookup:'<?php echo WPMU_PLUGIN_URL . '/bp-messages/autocomplete/bp-messages-autocomplete.php' ?>'});
     9    jQuery("ul.first").autoCompletefb({urlLookup:'<?php echo BP_PLUGIN_URL . '/bp-messages/autocomplete/bp-messages-autocomplete.php' ?>'});
    1010
    1111    jQuery('#send_message_form').submit( function() {

  • trunk/bp-messages/js/general.php

    r1209 r1303  
    3434           
    3535            var rand = Math.floor(Math.random()*100001);
    36             jQuery("form#send-reply").before('<div style="display:none;" class="ajax_reply" id="' + rand + '"><img src="<?php echo WPMU_PLUGIN_URL . '/bp-messages/images/loading.gif' ?>" alt="Loading" /> &nbsp;Sending Message...</div>');
     36            jQuery("form#send-reply").before('<div style="display:none;" class="ajax_reply" id="' + rand + '"><img src="<?php echo BP_PLUGIN_URL . '/bp-messages/images/loading.gif' ?>" alt="Loading" /> &nbsp;Sending Message...</div>');
    3737            jQuery("div#" + rand).fadeIn();
    3838       

  • trunk/bp-themes/buddypress-home/functions.php

    r1271 r1303  
    6868    global $bp, $current_blog;
    6969   
    70     require ( WPMU_PLUGIN_DIR . '/bp-core/bp-core-signup.php' );
     70    require ( BP_PLUGIN_DIR . '/bp-core/bp-core-signup.php' );
    7171   
    7272    if ( $bp->current_component == BP_REGISTER_SLUG && $bp->current_action == '' ) {
    … …  
    8080    global $bp, $current_blog;
    8181
    82     require ( WPMU_PLUGIN_DIR . '/bp-core/bp-core-activation.php' );
     82    require ( BP_PLUGIN_DIR . '/bp-core/bp-core-activation.php' );
    8383   
    8484    if ( $bp->current_component == BP_ACTIVATION_SLUG && $bp->current_action == '' ) {
    … …  
    8989add_action( 'wp', 'bp_show_activation_page', 2 );
    9090
    91 /* Hook for custom theme functions via plugins */
    92 do_action( 'bp_home_theme_functions' );
    93 
    9491
    9592?>

  • trunk/bp-themes/buddypress-home/style.css

    r1091 r1303  
    33Theme URI: http://buddypress.com/
    44Description: A widget framework theme for the home of a BuddyPress enabled installation. This theme is not required to use BuddyPress.
    5 Version: 1.0-RC1
     5Version: 1.0-RC2
    66Author: Andy Peatling
    77Author URI: http://apeatling.wordpress.com

  • trunk/bp-themes/buddypress-member/functions.php

    r1249 r1303  
    11<?php
    2 if ( function_exists('register_sidebar') )
    3     register_sidebar(array(
    4         'before_widget' => '<li id="%1$s" class="widget %2$s">',
    5         'after_widget' => '</li>',
    6         'before_title' => '<h2 class="widgettitle">',
    7         'after_title' => '</h2>',
    8     ));
    92
    103function bp_get_options_class() {
    … …  
    2619}
    2720
    28 /* Hook for custom theme functions via plugins */
    29 do_action( 'bp_member_theme_functions' );
    30 
    3121?>

  • trunk/bp-themes/buddypress-member/style.css

    r1091 r1303  
    33Theme URI: http://buddypress.org
    44Description: The default member theme for BuddyPress. This theme handles all non-blog pages.
    5 Version: 1.0-RC1
     5Version: 1.0-RC2
    66Author: Andy Peatling
    77Author URI: http://apeatling.wordpress.com
    8 BuddyPress Enabled: true
    98*/
    109

  • trunk/bp-themes/buddypress-member/userbar.php

    r1209 r1303  
    1919       
    2020        <p class="avatar">
    21             <img src="<?php echo WPMU_PLUGIN_URL . '/bp-core/images/mystery-man.jpg' ?>" alt="No User" width="50" height="50" />
     21            <img src="<?php echo BP_PLUGIN_URL . '/bp-core/images/mystery-man.jpg' ?>" alt="No User" width="50" height="50" />
    2222        </p>
    2323       

  • trunk/bp-wire.php

    r1270 r1303  
    55Description: Allows users to leave a comment on groups, profiles and custom components.
    66Author: BuddyPress
    7 Version: 1.0-RC1
     7Version: 1.0-RC2
    88Author URI: http://buddypress.org
    99Site Wide Only: true
    … …  
    1313
    1414define ( 'BP_WIRE_IS_INSTALLED', 1 );
    15 define ( 'BP_WIRE_VERSION', '1.0-RC1' );
     15define ( 'BP_WIRE_VERSION', '1.0-RC2' );
    1616
    1717/* Define the slug for the component */
    … …  
    3939    global $bp, $wpdb;
    4040   
    41     $bp->wire->image_base = WPMU_PLUGIN_URL . '/bp-wire/images';
     41    $bp->wire->image_base = BP_PLUGIN_URL . '/bp-wire/images';
    4242    $bp->wire->slug = BP_WIRE_SLUG;
    4343

  • trunk/bp-wire/bp-wire-cssjs.php

    r1209 r1303  
    33function bp_wire_add_structure_css() {
    44    /* Enqueue the structure CSS file to give basic positional formatting for components */
    5     wp_enqueue_style( 'bp-wire-structure', WPMU_PLUGIN_URL . '/bp-wire/css/structure.css' );   
     5    wp_enqueue_style( 'bp-wire-structure', BP_PLUGIN_URL . '/bp-wire/css/structure.css' ); 
    66}
    77add_action( 'bp_styles', 'bp_wire_add_structure_css' );

  • trunk/bp-xprofile.php

    r1293 r1303  
    55Description: Activates customizable profiles and avatars for site users.
    66Author: BuddyPress
    7 Version: 1.0-RC1
     7Version: 1.0-RC2
    88Author URI: http://buddypress.org
    99Site Wide Only: true
    … …  
    1313
    1414/* Set the version number */
    15 define ( 'BP_XPROFILE_VERSION', '1.0-RC1' );
    16 define ( 'BP_XPROFILE_DB_VERSION', '948' );
     15define ( 'BP_XPROFILE_VERSION', '1.0-RC2' );
     16define ( 'BP_XPROFILE_DB_VERSION', '1300' );
    1717
    1818/* Define the slug for the component */
    … …  
    150150    $bp->profile->format_activity_function = 'xprofile_format_activity';
    151151    $bp->profile->format_notification_function = 'xprofile_format_notifications';
    152     $bp->profile->image_base = WPMU_PLUGIN_URL . '/bp-xprofile/images';
     152    $bp->profile->image_base = BP_PLUGIN_URL . '/bp-xprofile/images';
    153153    $bp->profile->slug = BP_XPROFILE_SLUG;
    154154

  • trunk/bp-xprofile/bp-xprofile-classes.php

    r1298 r1303  
    777777       
    778778        // Files in wp-content/themes directory and one subdir down
    779         $prebuilt_fields_path = WPMU_PLUGIN_DIR . '/bp-xprofile/prebuilt-fields';
     779        $prebuilt_fields_path = BP_PLUGIN_DIR . '/bp-xprofile/prebuilt-fields';
    780780        if( !empty( $prebuilt_fields_path ) ){
    781781            $prebuilt_fields_dir = @opendir($prebuilt_fields_path);     

  • trunk/bp-xprofile/bp-xprofile-cssjs.php

    r1273 r1303  
    99function xprofile_add_css() {
    1010    if ( $_SERVER['SCRIPT_NAME'] == '/wp-signup.php' )
    11         wp_enqueue_style( 'bp-xprofile-signup', WPMU_PLUGIN_URL . '/bp-xprofile/css/signup.css' ); 
     11        wp_enqueue_style( 'bp-xprofile-signup', BP_PLUGIN_URL . '/bp-xprofile/css/signup.css' );   
    1212   
    1313    wp_print_styles();
    … …  
    1717function xprofile_add_structure_css() {
    1818    /* Enqueue the structure CSS file to give basic positional formatting for xprofile pages */
    19     wp_enqueue_style( 'bp-xprofile-structure', WPMU_PLUGIN_URL . '/bp-xprofile/css/structure.css' );   
     19    wp_enqueue_style( 'bp-xprofile-structure', BP_PLUGIN_URL . '/bp-xprofile/css/structure.css' ); 
    2020}
    2121add_action( 'bp_styles', 'xprofile_add_structure_css' );
    … …  
    2323function xprofile_add_admin_css() {
    2424    if ( strpos( $_GET['page'], 'xprofile' ) !== false ) {
    25         echo '<link rel="stylesheet" href="' . WPMU_PLUGIN_URL . '/bp-xprofile/css/admin.css' . '" type="text/css" />';
     25        echo '<link rel="stylesheet" href="' . BP_PLUGIN_URL . '/bp-xprofile/css/admin.css' . '" type="text/css" />';
    2626    }
    2727}
    … …  
    3030function xprofile_add_admin_js() {
    3131    if ( strpos( $_GET['page'], 'xprofile' ) !== false )
    32         echo '<script type="text/javascript" src="' . WPMU_PLUGIN_URL . '/bp-xprofile/js/admin.js' . '"></script>';
     32        echo '<script type="text/javascript" src="' . BP_PLUGIN_URL . '/bp-xprofile/js/admin.js' . '"></script>';
    3333}
    3434add_action( 'admin_head', 'xprofile_add_admin_js' );
Note: See TracChangeset for help on using the changeset viewer.