Ticket #918: load-ordering-fix.patch

bp-forums-bbpress.php

@@ -38 +38 @@
         
         require_once( BACKPRESS_PATH . 'class.wp-taxonomy.php' );
         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 );
@@ -69 +67 @@
         $bbdb->prefix = $bb_table_prefix;
 
         define( 'BB_INSTALLING', false );
+
+        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 ) ) {
                 $bb_roles =& $wp_roles;
@@ -92 +95 @@
                 $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 );