Ticket #3585: 3585.diff

bp-loader.php

@@ -60 +60 @@
         define( 'BP_SEARCH_SLUG', 'search' );
 
 // Setup the BuddyPress theme directory
-register_theme_directory( WP_PLUGIN_DIR . '/buddypress/bp-themes' );
+register_theme_directory( BP_PLUGIN_DIR . '/bp-themes' );
 
 /** Loader ********************************************************************/
 
@@ -79 +79 @@
 // This is a new installation.
 if ( empty( $bp->database_version ) ) {
         $bp->maintenance_mode = 'install';
-        require( WP_PLUGIN_DIR . '/buddypress/bp-core/admin/bp-core-update.php' );
+        require( BP_PLUGIN_DIR . '/bp-core/admin/bp-core-update.php' );
 
 // There is a previous installation
 } else {
         // Load core
-        require( WP_PLUGIN_DIR . '/buddypress/bp-core/bp-core-loader.php' );
+        require( BP_PLUGIN_DIR . '/bp-core/bp-core-loader.php' );
 
         // Check if an update is required
         if ( (int)$bp->database_version < (int)constant( 'BP_DB_VERSION' ) || isset( $bp->is_network_activate ) ) {
                 $bp->maintenance_mode = 'update';
-                require( WP_PLUGIN_DIR . '/buddypress/bp-core/admin/bp-core-update.php' );
+                require( BP_PLUGIN_DIR . '/bp-core/admin/bp-core-update.php' );
         }
 }