Skip to:
Content

BuddyPress.org

Changeset 1416


Ignore:
Timestamp:
04/27/2009 03:55:00 PM (15 years ago)
Author:
apeatling
Message:

Adding BP_PLUGIN_DIR to all require() calls to provide absolute paths. Fixes #965

Location:
trunk
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/bp-activity.php

    r1366 r1416  
    1212    define ( 'BP_ACTIVITY_CACHE_LENGTH', '6 HOURS' );
    1313
    14 require ( 'bp-activity/bp-activity-classes.php' );
    15 require ( 'bp-activity/bp-activity-templatetags.php' );
    16 require ( 'bp-activity/bp-activity-widgets.php' );
    17 require ( 'bp-activity/bp-activity-cssjs.php' );
    18 require ( 'bp-activity/bp-activity-filters.php' );
     14require ( BP_PLUGIN_DIR . '/bp-activity/bp-activity-classes.php' );
     15require ( BP_PLUGIN_DIR . '/bp-activity/bp-activity-templatetags.php' );
     16require ( BP_PLUGIN_DIR . '/bp-activity/bp-activity-widgets.php' );
     17require ( BP_PLUGIN_DIR . '/bp-activity/bp-activity-cssjs.php' );
     18require ( BP_PLUGIN_DIR . '/bp-activity/bp-activity-filters.php' );
    1919
    2020

  • trunk/bp-blogs.php

    r1398 r1416  
    88    define ( 'BP_BLOGS_SLUG', 'blogs' );
    99
    10 require ( 'bp-blogs/bp-blogs-classes.php' );
    11 require ( 'bp-blogs/bp-blogs-cssjs.php' );
    12 require ( 'bp-blogs/bp-blogs-templatetags.php' );
    13 require ( 'bp-blogs/bp-blogs-widgets.php' );
    14 require ( 'bp-blogs/bp-blogs-ajax.php' );
     10require ( BP_PLUGIN_DIR . '/bp-blogs/bp-blogs-classes.php' );
     11require ( BP_PLUGIN_DIR . '/bp-blogs/bp-blogs-cssjs.php' );
     12require ( BP_PLUGIN_DIR . '/bp-blogs/bp-blogs-templatetags.php' );
     13require ( BP_PLUGIN_DIR . '/bp-blogs/bp-blogs-widgets.php' );
     14require ( BP_PLUGIN_DIR . '/bp-blogs/bp-blogs-ajax.php' );
    1515
    1616

  • trunk/bp-core.php

    r1414 r1416  
    2929
    3030/* Load the files containing functions that we globally will need. */
    31 require ( 'bp-core/bp-core-catchuri.php' );
    32 require ( 'bp-core/bp-core-classes.php' );
    33 require ( 'bp-core/bp-core-cssjs.php' );
    34 require ( 'bp-core/bp-core-avatars.php' );
    35 require ( 'bp-core/bp-core-templatetags.php' );
    36 require ( 'bp-core/bp-core-settings.php' );
    37 require ( 'bp-core/bp-core-widgets.php' );
    38 require ( 'bp-core/bp-core-ajax.php' );
    39 require ( 'bp-core/bp-core-notifications.php' );
     31require ( BP_PLUGIN_DIR . '/bp-core/bp-core-catchuri.php' );
     32require ( BP_PLUGIN_DIR . '/bp-core/bp-core-classes.php' );
     33require ( BP_PLUGIN_DIR . '/bp-core/bp-core-cssjs.php' );
     34require ( BP_PLUGIN_DIR . '/bp-core/bp-core-avatars.php' );
     35require ( BP_PLUGIN_DIR . '/bp-core/bp-core-templatetags.php' );
     36require ( BP_PLUGIN_DIR . '/bp-core/bp-core-settings.php' );
     37require ( BP_PLUGIN_DIR . '/bp-core/bp-core-widgets.php' );
     38require ( BP_PLUGIN_DIR . '/bp-core/bp-core-ajax.php' );
     39require ( BP_PLUGIN_DIR . '/bp-core/bp-core-notifications.php' );
    4040
    4141if ( !defined( 'BP_DISABLE_ADMIN_BAR') )
    … …  
    238238        return false;
    239239   
    240     require ( 'bp-core/bp-core-admin.php' );
     240    require ( BP_PLUGIN_DIR . '/bp-core/bp-core-admin.php' );
    241241
    242242    /* Need to check db tables exist, activate hook no-worky in mu-plugins folder. */

  • trunk/bp-forums.php

    r1366 r1416  
    77    define ( 'BP_FORUMS_PARENT_FORUM_ID', 1 );
    88
    9 require ( 'bp-forums/bp-forums-bbpress-live.php' );
    10 require ( 'bp-forums/bp-forums-templatetags.php' );
    11 require ( 'bp-forums/bp-forums-filters.php' );
     9require ( BP_PLUGIN_DIR . '/bp-forums/bp-forums-bbpress-live.php' );
     10require ( BP_PLUGIN_DIR . '/bp-forums/bp-forums-templatetags.php' );
     11require ( BP_PLUGIN_DIR . '/bp-forums/bp-forums-filters.php' );
    1212
    1313if ( is_admin() )

  • trunk/bp-friends.php

    r1408 r1416  
    88    define ( 'BP_FRIENDS_SLUG', 'friends' );
    99
    10 require ( 'bp-friends/bp-friends-classes.php' );
    11 require ( 'bp-friends/bp-friends-ajax.php' );
    12 require ( 'bp-friends/bp-friends-cssjs.php' );
    13 require ( 'bp-friends/bp-friends-templatetags.php' );
     10require ( BP_PLUGIN_DIR . '/bp-friends/bp-friends-classes.php' );
     11require ( BP_PLUGIN_DIR . '/bp-friends/bp-friends-ajax.php' );
     12require ( BP_PLUGIN_DIR . '/bp-friends/bp-friends-cssjs.php' );
     13require ( BP_PLUGIN_DIR . '/bp-friends/bp-friends-templatetags.php' );
    1414
    1515/**************************************************************************
    … …  
    521521       
    522522        // Send the email notification
    523         require_once( 'bp-friends/bp-friends-notifications.php' );
     523        require_once( BP_PLUGIN_DIR . '/bp-friends/bp-friends-notifications.php' );
    524524        friends_notification_new_request( $friendship->id, $friendship->initiator_user_id, $friendship->friend_user_id );
    525525       
    … …  
    582582       
    583583        // Send the email notification
    584         require_once( 'bp-friends/bp-friends-notifications.php' );
     584        require_once( BP_PLUGIN_DIR . '/bp-friends/bp-friends-notifications.php' );
    585585        friends_notification_accepted_request( $friendship->id, $friendship->initiator_user_id, $friendship->friend_user_id );
    586586

  • trunk/bp-groups.php

    r1408 r1416  
    88    define ( 'BP_GROUPS_SLUG', 'groups' );
    99
    10 require ( 'bp-groups/bp-groups-classes.php' );
    11 require ( 'bp-groups/bp-groups-ajax.php' );
    12 require ( 'bp-groups/bp-groups-cssjs.php' );
    13 require ( 'bp-groups/bp-groups-templatetags.php' );
    14 require ( 'bp-groups/bp-groups-widgets.php' );
    15 require ( 'bp-groups/bp-groups-filters.php' );
     10require ( BP_PLUGIN_DIR . '/bp-groups/bp-groups-classes.php' );
     11require ( BP_PLUGIN_DIR . '/bp-groups/bp-groups-ajax.php' );
     12require ( BP_PLUGIN_DIR . '/bp-groups/bp-groups-cssjs.php' );
     13require ( BP_PLUGIN_DIR . '/bp-groups/bp-groups-templatetags.php' );
     14require ( BP_PLUGIN_DIR . '/bp-groups/bp-groups-widgets.php' );
     15require ( BP_PLUGIN_DIR . '/bp-groups/bp-groups-filters.php' );
    1616
    1717
    … …  
    150150    global $wpdb, $bp;
    151151   
    152     require ( 'bp-groups/bp-groups-admin.php' );
     152    require ( BP_PLUGIN_DIR . '/bp-groups/bp-groups-admin.php' );
    153153
    154154    /* Need to check db tables exist, activate hook no-worky in mu-plugins folder. */
    … …  
    17481748    }
    17491749   
    1750     require_once ( 'bp-groups/bp-groups-notifications.php' );
     1750    require_once ( BP_PLUGIN_DIR . '/bp-groups/bp-groups-notifications.php' );
    17511751
    17521752    // Send friend invites.
    … …  
    19141914
    19151915    if ( $notify_members ) {
    1916         require_once ( 'bp-groups/bp-groups-notifications.php' );
     1916        require_once ( BP_PLUGIN_DIR . '/bp-groups/bp-groups-notifications.php' );
    19171917        groups_notification_group_updated( $group->id );
    19181918    }
    … …  
    20402040        $admins = groups_get_group_admins( $group_id );
    20412041
    2042         require_once ( 'bp-groups/bp-groups-notifications.php' );
     2042        require_once ( BP_PLUGIN_DIR . '/bp-groups/bp-groups-notifications.php' );
    20432043
    20442044        for ( $i = 0; $i < count( $admins ); $i++ ) {
    … …  
    20752075
    20762076    /* Send a notification to the user. */
    2077     require_once ( 'bp-groups/bp-groups-notifications.php' );
     2077    require_once ( BP_PLUGIN_DIR . '/bp-groups/bp-groups-notifications.php' );
    20782078    groups_notification_membership_request_completed( $membership->user_id, $membership->group_id, true );
    20792079   
    … …  
    20952095   
    20962096    // Send a notification to the user.
    2097     require_once ( 'bp-groups/bp-groups-notifications.php' );
     2097    require_once ( BP_PLUGIN_DIR . '/bp-groups/bp-groups-notifications.php' );
    20982098    groups_notification_membership_request_completed( $membership->user_id, $membership->group_id, false );
    20992099   

  • trunk/bp-messages.php

    r1366 r1416  
    474474               
    475475                // Send email notifications to the recipients
    476                 require_once( 'bp-messages/bp-messages-notifications.php' );
     476                require_once( BP_PLUGIN_DIR . '/bp-messages/bp-messages-notifications.php' );
    477477                messages_notification_new_message( array( 'item_id' => $pmessage->id, 'recipient_ids' => $pmessage->recipients, 'thread_id' => $pmessage->thread_id, 'component_name' => 'messages', 'component_action' => 'message_sent', 'is_private' => 1 ) );
    478478

  • trunk/bp-wire.php

    r1412 r1416  
    77    define ( 'BP_WIRE_SLUG', 'wire' );
    88
    9 require ( 'bp-wire/bp-wire-classes.php' );
    10 require ( 'bp-wire/bp-wire-ajax.php' );
    11 require ( 'bp-wire/bp-wire-templatetags.php' );
    12 require ( 'bp-wire/bp-wire-cssjs.php' );
    13 require ( 'bp-wire/bp-wire-filters.php' );
     9require ( BP_PLUGIN_DIR . '/bp-wire/bp-wire-classes.php' );
     10require ( BP_PLUGIN_DIR . '/bp-wire/bp-wire-ajax.php' );
     11require ( BP_PLUGIN_DIR . '/bp-wire/bp-wire-templatetags.php' );
     12require ( BP_PLUGIN_DIR . '/bp-wire/bp-wire-cssjs.php' );
     13require ( BP_PLUGIN_DIR . '/bp-wire/bp-wire-filters.php' );
    1414
    1515/**************************************************************************

  • trunk/bp-xprofile.php

    r1402 r1416  
    88    define ( 'BP_XPROFILE_SLUG', 'profile' );
    99
    10 require ( 'bp-xprofile/bp-xprofile-classes.php' );
    11 require ( 'bp-xprofile/bp-xprofile-filters.php' );
    12 require ( 'bp-xprofile/bp-xprofile-signup.php' );
    13 require ( 'bp-xprofile/bp-xprofile-templatetags.php' );
    14 require ( 'bp-xprofile/bp-xprofile-notifications.php' );
    15 require ( 'bp-xprofile/bp-xprofile-cssjs.php' );
     10require ( BP_PLUGIN_DIR . '/bp-xprofile/bp-xprofile-classes.php' );
     11require ( BP_PLUGIN_DIR . '/bp-xprofile/bp-xprofile-filters.php' );
     12require ( BP_PLUGIN_DIR . '/bp-xprofile/bp-xprofile-signup.php' );
     13require ( BP_PLUGIN_DIR . '/bp-xprofile/bp-xprofile-templatetags.php' );
     14require ( BP_PLUGIN_DIR . '/bp-xprofile/bp-xprofile-notifications.php' );
     15require ( BP_PLUGIN_DIR . '/bp-xprofile/bp-xprofile-cssjs.php' );
    1616
    1717/* Assign the base group and fullname field names to constants to use in SQL statements */
    … …  
    171171        return false;
    172172
    173     require ( 'bp-xprofile/bp-xprofile-admin.php' );
     173    require ( BP_PLUGIN_DIR . '/bp-xprofile/bp-xprofile-admin.php' );
    174174   
    175175    /* Add the administration tab under the "Site Admin" tab for site administrators */
Note: See TracChangeset for help on using the changeset viewer.