Changeset 1521

Timestamp:

06/05/2009 10:06:23 PM (15 years ago)

Author:

apeatling

Message:

FIxes #768

Location:

trunk

Files:

• bp-core.php (modified) (1 diff)
• bp-forums.php (modified) (1 diff)
• bp-loader.php (modified) (1 diff)
• bp-messages.php (modified) (1 diff)

trunk/bp-core.php

@@ -40 +40 @@
 /* If BP_DISABLE_ADMIN_BAR is defined, do not load the global admin bar */
 if ( !defined( 'BP_DISABLE_ADMIN_BAR') )
-    require ( 'bp-core/bp-core-adminbar.php' );
+    require ( BP_PLUGIN_DIR . '/bp-core/bp-core-adminbar.php' );
 
 /* Define the slug for member pages and the members directory (e.g. domain.com/[members] ) */

trunk/bp-forums.php

@@ -12 +12 @@
 
 if ( is_admin() )
-    require ( 'bp-forums/bp-forums-admin.php' );
+    require ( BP_PLUGIN_DIR . '/bp-forums/bp-forums-admin.php' );
 
 function bp_forums_setup() {

trunk/bp-loader.php

@@ -17 +17 @@
  */
 
-require_once( 'bp-core.php' );
+require_once( WP_PLUGIN_DIR . '/buddypress/bp-core.php' );
 $deactivated = apply_filters( 'bp_deactivated_components', get_site_option( 'bp-deactivated-components' ) );
 
 /* Activity Streams */
 if ( !isset( $deactivated['bp-activity.php'] ) && file_exists( BP_PLUGIN_DIR . '/bp-activity.php') )
-    include( 'bp-activity.php' );
+    include( BP_PLUGIN_DIR . '/bp-activity.php' );
 
 /* Blog Tracking */
 if ( !isset( $deactivated['bp-blogs.php'] ) && file_exists( BP_PLUGIN_DIR . '/bp-blogs.php') )
-    include( 'bp-blogs.php' );
+    include( BP_PLUGIN_DIR . '/bp-blogs.php' );
 
 /* bbPress Forum Integration */
 if ( !isset( $deactivated['bp-forums.php'] ) && file_exists( BP_PLUGIN_DIR . '/bp-forums.php') )
-    include( 'bp-forums.php' );
+    include( BP_PLUGIN_DIR . '/bp-forums.php' );
 
 /* Friend Connections */
 if ( !isset( $deactivated['bp-friends.php'] ) && file_exists( BP_PLUGIN_DIR . '/bp-friends.php') )
-    include( 'bp-friends.php' );
+    include( BP_PLUGIN_DIR . '/bp-friends.php' );
 
 /* Groups Support */
 if ( !isset( $deactivated['bp-groups.php'] ) && file_exists( BP_PLUGIN_DIR . '/bp-groups.php') )
-    include( 'bp-groups.php' );
+    include( BP_PLUGIN_DIR . '/bp-groups.php' );
 
 /* Private Messaging */ 
 if ( !isset( $deactivated['bp-messages.php'] ) && file_exists( BP_PLUGIN_DIR . '/bp-messages.php') )
-    include( 'bp-messages.php' );
+    include( BP_PLUGIN_DIR . '/bp-messages.php' );
     
 /* Wire Support */
 if ( !isset( $deactivated['bp-wire.php'] ) && file_exists( BP_PLUGIN_DIR . '/bp-wire.php') )
-    include( 'bp-wire.php' );
+    include( BP_PLUGIN_DIR . '/bp-wire.php' );
 
 /* Extended Profiles */ 
 if ( !isset( $deactivated['bp-xprofile.php'] ) && file_exists( BP_PLUGIN_DIR . '/bp-xprofile.php') )
-    include( 'bp-xprofile.php' );
+    include( BP_PLUGIN_DIR . '/bp-xprofile.php' );
 
 ?>

trunk/bp-messages.php

@@ -8 +8 @@
     define ( 'BP_MESSAGES_SLUG', 'messages' );
 
-require ( 'bp-messages/bp-messages-classes.php' );
-require ( 'bp-messages/bp-messages-ajax.php' );
-require ( 'bp-messages/bp-messages-cssjs.php' );
-require ( 'bp-messages/bp-messages-templatetags.php' );
-require ( 'bp-messages/bp-messages-filters.php' );
+require ( BP_PLUGIN_DIR . '/bp-messages/bp-messages-classes.php' );
+require ( BP_PLUGIN_DIR . '/bp-messages/bp-messages-ajax.php' );
+require ( BP_PLUGIN_DIR . '/bp-messages/bp-messages-cssjs.php' );
+require ( BP_PLUGIN_DIR . '/bp-messages/bp-messages-templatetags.php' );
+require ( BP_PLUGIN_DIR . '/bp-messages/bp-messages-filters.php' );
 
 /**************************************************************************