Changeset 5483 for branches/1.5/bp-members/bp-members-adminbar.php

Timestamp:

12/10/2011 06:16:23 PM (13 years ago)

Author:

johnjamesjacoby

Message:

First pass at WordPress 3.3 admin bar compat for 1.5 branch:

• Introduce version check functions for groups, members, and core components
• Add version checks in the above top level menus to tweak formatting for 3.2/3.3
• See 3828

File:

• branches/1.5/bp-members/bp-members-adminbar.php (modified) (9 diffs)

branches/1.5/bp-members/bp-members-adminbar.php

@@ -13 +13 @@
 
 /**
+ * Adjust the admin bar menus based on which WordPress version this is
+ *
+ * @since BuddyPress (1.5.2)
+ */
+function bp_members_admin_bar_version_check() {
+    
+    if ( '3.2' == bp_get_major_wp_version() ) {
+        add_action( 'bp_setup_admin_bar', 'bp_members_admin_bar_my_account_menu',    4    );
+        add_action( 'bp_setup_admin_bar', 'bp_members_admin_bar_notifications_menu', 5    );
+        add_action( 'bp_setup_admin_bar', 'bp_members_admin_bar_user_admin_menu',    99   );
+        add_action( 'bp_setup_admin_bar', 'bp_members_admin_bar_my_account_logout',  9999 );
+    } elseif ( '3.3' == bp_get_major_wp_version() ) {
+        add_action( 'bp_setup_admin_bar', 'bp_members_admin_bar_my_account_menu',    4   );
+        add_action( 'bp_setup_admin_bar', 'bp_members_admin_bar_notifications_menu', 5   );
+        add_action( 'admin_bar_menu',     'bp_members_admin_bar_user_admin_menu',    400 );
+    }
+}
+add_action( 'admin_bar_menu', 'bp_members_admin_bar_version_check', 4 );
+
+/**
  * Add the "My Account" menu and all submenus.
  *
@@ -18 +38 @@
  */
 function bp_members_admin_bar_my_account_menu() {
-    global $bp, $wp_admin_bar;
+    global $bp, $wp_admin_bar, $wp_version;
 
     // Bail if this is an ajax request
@@ -27 +47 @@
     if ( is_user_logged_in() ) {
 
-        // User avatar
-        $avatar = bp_core_fetch_avatar( array(
-            'item_id' => $bp->loggedin_user->id,
-            'email'   => $bp->loggedin_user->userdata->user_email,
-            'width'   => 16,
-            'height'  => 16
-        ) );
-
-        // Unique ID for the 'My Account' menu
-        $bp->my_account_menu_id = ( ! empty( $avatar ) ) ? 'my-account-with-avatar' : 'my-account';
-
-        // Create the main 'My Account' menu
-        $wp_admin_bar->add_menu( array(
-            'id'    => $bp->my_account_menu_id,
-            'title' => $avatar . bp_get_loggedin_user_fullname(),
-            'href'  => $bp->loggedin_user->domain
-        ) );
+        if ( '3.2' == bp_get_major_wp_version() ) {
+
+            // User avatar
+            $avatar = bp_core_fetch_avatar( array(
+                'item_id' => $bp->loggedin_user->id,
+                'email'   => $bp->loggedin_user->userdata->user_email,
+                'width'   => 16,
+                'height'  => 16
+            ) );
+
+            // Unique ID for the 'My Account' menu
+            $bp->my_account_menu_id = ( ! empty( $avatar ) ) ? 'my-account-with-avatar' : 'my-account';
+
+            // Create the main 'My Account' menu
+            $wp_admin_bar->add_menu( array(
+                'id'    => $bp->my_account_menu_id,
+                'title' => $avatar . bp_get_loggedin_user_fullname(),
+                'href'  => $bp->loggedin_user->domain
+            ) );
+
+        } else {
+
+            // Unique ID for the 'My Account' menu
+            $bp->my_account_menu_id = 'my-account-buddypress';
+
+            // Create the main 'My Account' menu
+            $wp_admin_bar->add_menu( array(
+                'parent' => 'my-account',
+                'id'     => $bp->my_account_menu_id,
+                'href'   => $bp->loggedin_user->domain,
+                'group'  => true,
+                'meta'   => array( 'class' => 'ab-sub-secondary' )
+            ) );
+        }
 
     // Show login and sign-up links
@@ -67 +104 @@
     }
 }
-add_action( 'bp_setup_admin_bar', 'bp_members_admin_bar_my_account_menu', 4 );
 
 /**
@@ -86 +122 @@
         return false;
 
-    // User avatar
-    $avatar = bp_core_fetch_avatar( array(
-        'item_id' => $bp->displayed_user->id,
-        'email'   => $bp->displayed_user->userdata->user_email,
-        'width'   => 16,
-        'height'  => 16
-    ) );
-
-    // Unique ID for the 'My Account' menu
-    $bp->user_admin_menu_id = ( ! empty( $avatar ) ) ? 'user-admin-with-avatar' : 'user-admin';
-
-    // Add the top-level User Admin button
-    $wp_admin_bar->add_menu( array(
-        'id'    => $bp->user_admin_menu_id,
-        'title' => $avatar . bp_get_displayed_user_fullname(),
-        'href'  => bp_displayed_user_domain()
-    ) );
+    if ( '3.2' == bp_get_major_wp_version() ) {
+
+        // User avatar
+        $avatar = bp_core_fetch_avatar( array(
+            'item_id' => $bp->displayed_user->id,
+            'email'   => $bp->displayed_user->userdata->user_email,
+            'width'   => 16,
+            'height'  => 16
+        ) );
+
+        // Unique ID for the 'My Account' menu
+        $bp->user_admin_menu_id = ( ! empty( $avatar ) ) ? 'user-admin-with-avatar' : 'user-admin';
+
+        // Add the top-level User Admin button
+        $wp_admin_bar->add_menu( array(
+            'id'    => $bp->user_admin_menu_id,
+            'title' => $avatar . bp_get_displayed_user_fullname(),
+            'href'  => bp_displayed_user_domain()
+        ) );
+
+    } elseif ( '3.3' == bp_get_major_wp_version() ) {
+        
+        // Unique ID for the 'My Account' menu
+        $bp->user_admin_menu_id = 'user-admin';
+
+        // Add the top-level User Admin button
+        $wp_admin_bar->add_menu( array(
+            'id'    => $bp->user_admin_menu_id,
+            'title' => __( 'Edit Member', 'buddypress' ),
+            'href'  => bp_displayed_user_domain()
+        ) );
+    }
 
     // User Admin > Edit this user's profile
@@ -148 +199 @@
     ) );
 }
-add_action( 'bp_setup_admin_bar', 'bp_members_admin_bar_user_admin_menu', 99 );
 
 /**
@@ -168 +218 @@
     }
 
-    // Add the top-level Notifications button
-    $wp_admin_bar->add_menu( array(
-        'id'    => 'bp-notifications',
-        'title' => $menu_title,
-        'href'  => bp_loggedin_user_domain()
-    ) );
+    if ( '3.2' == bp_get_major_wp_version() ) {
+
+        // Add the top-level Notifications button
+        $wp_admin_bar->add_menu( array(
+            'id'    => 'bp-notifications',
+            'title' => $menu_title,
+            'href'  => bp_loggedin_user_domain()
+        ) );
+
+    } elseif ( '3.3' == bp_get_major_wp_version() ) {
+        
+        // Add the top-level Notifications button
+        $wp_admin_bar->add_menu( array(
+            'parent' => 'top-secondary',
+            'id'     => 'bp-notifications',
+            'title'  => $menu_title,
+            'href'   => bp_loggedin_user_domain()
+        ) );
+    }
 
     if ( !empty( $notifications ) ) {
@@ -195 +258 @@
     return;
 }
-add_action( 'bp_setup_admin_bar', 'bp_members_admin_bar_notifications_menu', 999 );
 
 /**
@@ -222 +284 @@
     }
 }
-add_action( 'bp_setup_admin_bar', 'bp_members_admin_bar_my_account_logout', 9999 );
 
 ?>