Changeset 3775

Timestamp:

01/20/2011 09:08:27 PM (14 years ago)

Author:

boonebgorges

Message:

Fixes function_exists error in previous commit. Adjusts admin menu hooks to be compatible with Network Admin in WP 3.1. Fixes #3017

Location:

branches/1.2

Files:

• bp-activity.php (modified) (1 diff)
• bp-blogs.php (modified) (1 diff)
• bp-core.php (modified) (3 diffs)
• bp-core/bp-core-adminbar.php (modified) (1 diff)
• bp-forums.php (modified) (1 diff)
• bp-friends.php (modified) (1 diff)
• bp-groups.php (modified) (1 diff)
• bp-messages.php (modified) (1 diff)
• bp-xprofile.php (modified) (1 diff)
• bp-xprofile/bp-xprofile-cssjs.php (modified) (2 diffs)

branches/1.2/bp-activity.php

@@ -100 +100 @@
 }
 add_action( 'admin_menu', 'bp_activity_check_installed' );
+add_action( 'network_admin_menu', 'bp_activity_check_installed' );
 
 function bp_activity_setup_root_component() {

branches/1.2/bp-blogs.php

@@ -62 +62 @@
 }
 add_action( 'admin_menu', 'bp_blogs_check_installed' );
+add_action( 'network_admin_menu', 'bp_blogs_check_installed' );
 
 function bp_blogs_setup_globals() {

branches/1.2/bp-core.php

@@ -286 +286 @@
 }
 add_action( 'admin_menu', 'bp_core_check_installed' );
+add_action( 'network_admin_menu', 'bp_core_check_installed' );
 
 /**
@@ -301 +302 @@
         return false;
 
-    /* Add the administration tab under the "Site Admin" tab for site administrators */
+    // If this is WP 3.1+ and multisite is enabled, only load on the Network Admin
+    if ( is_multisite() && function_exists( 'is_network_admin' ) && ! is_network_admin()  )
+        return false;
+
+    // Add the administration tab under the "Site Admin" tab for site administrators
     bp_core_add_admin_menu_page( array(
         'menu_title' => __( 'BuddyPress', 'buddypress' ),
@@ -314 +319 @@
 }
 add_action( 'admin_menu', 'bp_core_add_admin_menu' );
+add_action( 'network_admin_menu', 'bp_core_add_admin_menu' );
 
 /**

branches/1.2/bp-core/bp-core-adminbar.php

@@ -292 +292 @@
     } elseif ( !defined( 'BP_DISABLE_ADMIN_BAR' ) || !BP_DISABLE_ADMIN_BAR ) {
         // Keep the WP admin bar from loading
-        show_admin_bar( false );
+        if ( function_exists( 'show_admin_bar' ) )
+            show_admin_bar( false );
         
         // Actions used to build the BP admin bar

branches/1.2/bp-forums.php

@@ -104 +104 @@
 }
 add_action( 'admin_menu', 'bp_forums_add_admin_menu' );
+add_action( 'network_admin_menu', 'bp_forums_add_admin_menu' );
 
 /* Forum Functions */

branches/1.2/bp-friends.php

@@ -63 +63 @@
 }
 add_action( 'admin_menu', 'friends_check_installed' );
+add_action( 'network_admin_menu', 'friends_check_installed' );
 
 function friends_setup_nav() {

branches/1.2/bp-groups.php

@@ -118 +118 @@
 }
 add_action( 'admin_menu', 'groups_check_installed' );
+add_action( 'network_admin_menu', 'groups_check_installed' );
 
 function groups_setup_nav() {

branches/1.2/bp-messages.php

@@ -98 +98 @@
 }
 add_action( 'admin_menu', 'messages_check_installed' );
+add_action( 'network_admin_menu', 'messages_check_installed' );
 
 function messages_setup_nav() {

branches/1.2/bp-xprofile.php

@@ -153 +153 @@
 }
 add_action( 'admin_menu', 'xprofile_add_admin_menu' );
+add_action( 'network_admin_menu', 'xprofile_add_admin_menu' );
 
 /**

branches/1.2/bp-xprofile/bp-xprofile-cssjs.php

@@ -2 +2 @@
 
 function xprofile_add_admin_css() {
+    // If this is WP 3.1+ and multisite is enabled, only load on the Network Admin
+    if ( is_multisite() && function_exists( 'is_network_admin' ) && ! is_network_admin()  )
+        return false;
+    
     wp_enqueue_style( 'xprofile-admin-css', BP_PLUGIN_URL . '/bp-xprofile/admin/css/admin.css' );
 }
 add_action( 'admin_menu', 'xprofile_add_admin_css' );
+add_action( 'network_admin_menu', 'xprofile_add_admin_css' );
 
 function xprofile_add_admin_js() {
+    // If this is WP 3.1+ and multisite is enabled, only load on the Network Admin
+    if ( is_multisite() && function_exists( 'is_network_admin' ) && ! is_network_admin()  )
+        return false;
+
     if ( strpos( $_GET['page'], 'bp-profile-setup' ) !== false ) {
         wp_enqueue_script( array( "jquery-ui-sortable" ) );
@@ -13 +22 @@
 }
 add_action( 'admin_menu', 'xprofile_add_admin_js', 1 );
+add_action( 'network_admin_menu', 'xprofile_add_admin_js', 1 );
 
 ?>