Changeset 3775 for branches/1.2/bp-xprofile/bp-xprofile-cssjs.php

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

File:

• branches/1.2/bp-xprofile/bp-xprofile-cssjs.php (modified) (2 diffs)

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 );
 
 ?>