Changeset 869

Timestamp:

01/19/2009 04:56:14 AM (18 years ago)

Author:

apeatling

Message:

Removed dependency on the groups component

Location:

trunk

Files:

• bp-forums.php (modified) (1 diff)
• bp-forums/bp-forums-admin.php (modified) (2 diffs)

trunk/bp-forums.php

@@ -21 +21 @@
         if ( get_usermeta( $bp['loggedin_userid'], 'bb_capabilities' ) == '' )
                 bp_forums_make_user_active_member( $bp['loggedin_userid'] );
-        
-        if ( $bp['current_component'] == $bp['groups']['slug'] || $_GET['page'] == 'bp_forums_settings' ) { 
-                if ( defined('XMLRPC_REQUEST') && XMLRPC_REQUEST ) return;
-                if ( defined('DOING_AJAX') && DOING_AJAX ) return;
-                
-                include_once( ABSPATH . WPINC . '/class-IXR.php' );
-        
-                $bbpress_live = new bbPress_Live();
-        }
 }
 add_action( 'wp', 'bp_forums_setup', 3 );

trunk/bp-forums/bp-forums-admin.php

@@ -5 +5 @@
         if ( is_site_admin() ) {
                 /* Add the administration tab under the "Site Admin" tab for site administrators */
-                add_submenu_page( 'wpmu-admin.php', __( 'Group Forums', 'buddypress' ), __( 'Group Forums', 'buddypress' ), 1, "bp_forums_settings", "bp_forums_bbpress_admin" );
+                add_submenu_page( 'wpmu-admin.php', __( 'bbPress Forums', 'buddypress' ), __( 'bbPress Forums', 'buddypress' ), 1, "bp_forums_settings", "bp_forums_bbpress_admin" );
         }
 }
@@ -12 +12 @@
 function bp_forums_bbpress_admin() { 
         global $bp, $bbpress_live;
+        
+        if ( !is_object( $bbpress_live ) ) {
+                include_once( ABSPATH . WPINC . '/class-IXR.php' );
+                $bbpress_live = new bbPress_Live();
+        }
         
         if ( isset( $_POST['submit'] ) ) {