Changeset 1652

Timestamp:

08/11/2009 11:23:45 PM (15 years ago)

Author:

apeatling

Message:

re-patching r1627 as it was lost in a later revision. Props junsuijin. Fixes #918

File:

• trunk/bp-forums/bp-forums-bbpress.php (modified) (3 diffs)

trunk/bp-forums/bp-forums-bbpress.php

@@ -40 +40 @@
     require_once( BB_PATH . BB_INC . 'class.bb-taxonomy.php' );
     
-    require_once( BB_PATH . 'bb-admin/includes/functions.bb-admin.php' );
-
     $bb = new stdClass();
     require_once( $bp->forums->bbconfig );
@@ -70 +68 @@
 
     define( 'BB_INSTALLING', false );
+
+    /* This must be loaded before functionss.bb-admin.php otherwise we get a function conflict. */
+    if ( !$tables_installed = (boolean) $bbdb->get_results( 'DESCRIBE `' . $bbdb->forums . '`;', ARRAY_A ) )
+        require_once( ABSPATH . 'wp-admin/upgrade-functions.php' );
+        
+    require_once( BB_PATH . 'bb-admin/includes/functions.bb-admin.php' );
+
     
     if ( is_object( $wp_roles ) ) {
@@ -92 +97 @@
         $bb->site_id = BP_ROOT_BLOG;
 
+
     /* Check if the tables are installed, if not, install them */
-    if ( !(boolean) $bbdb->get_results( 'DESCRIBE `' . $bbdb->forums . '`;', ARRAY_A ) ) {
+    if ( !$tables_installed ) {
         require_once( BB_PATH . 'bb-admin/includes/defaults.bb-schema.php' );
-        require_once( ABSPATH . 'wp-admin/upgrade-functions.php' );
 
         dbDelta( $bb_queries );