Changeset 3917 for trunk/bp-core/bp-core-buddybar.php

Timestamp:

01/25/2011 08:58:56 PM (14 years ago)

Author:

johnjamesjacoby

Message:

Rename new 'bp-users' component to 'bp-members' for consistency through-out project.
Core, Messages, and Friends Components now use the BP_Component class.
Split Friends and Messages components into smaller files.
Change references to 'profile' to 'xprofile' through-out project for consistency.
Introduce 'bp_actions' and 'bp_screens' standard hooks to replace the usage of 'wp' through-out project.
Move component loader sequence into bp-core-bootstrap.php,
Move old root_component action into 1.3 deprecated file.

File:

• trunk/bp-core/bp-core-buddybar.php (modified) (7 diffs)

trunk/bp-core/bp-core-buddybar.php

@@ -63 +63 @@
     if ( bp_is_current_component( $slug ) && !bp_current_action() ) {
         if ( !is_object( $screen_function[0] ) )
-            add_action( 'wp', $screen_function, 3 );
+            add_action( 'bp_screens', $screen_function );
         else
-            add_action( 'wp', array( &$screen_function[0], $screen_function[1] ), 3 );
+            add_action( 'bp_screens', array( &$screen_function[0], $screen_function[1] ), 3 );
 
         if ( !empty( $default_subnav_slug ) )
@@ -92 +92 @@
     if ( $function = $bp->bp_nav[$parent_slug]['screen_function'] ) {
         if ( !is_object( $function[0] ) )
-            remove_action( 'wp', $function, 3 );
+            remove_action( 'bp_screens', $function, 3 );
         else
-            remove_action( 'wp', array( &$function[0], $function[1] ), 3 );
+            remove_action( 'bp_screens', array( &$function[0], $function[1] ), 3 );
     }
 
@@ -101 +101 @@
     if ( $bp->current_component == $parent_slug && !$bp->current_action ) {
         if ( !is_object( $screen_function[0] ) )
-            add_action( 'wp', $screen_function, 3 );
+            add_action( 'bp_screens', $screen_function );
         else
-            add_action( 'wp', array( &$screen_function[0], $screen_function[1] ), 3 );
+            add_action( 'bp_screens', array( &$screen_function[0], $screen_function[1] ) );
 
         if ( $subnav_slug )
@@ -189 +189 @@
     if ( ( $bp->current_action == $slug && $bp->current_component == $parent_slug ) && $user_has_access ) {
         if ( !is_object( $screen_function[0] ) )
-            add_action( 'wp', $screen_function, 3 );
+            add_action( 'bp_screens', $screen_function );
         else
-            add_action( 'wp', array( &$screen_function[0], $screen_function[1] ), 3 );
+            add_action( 'bp_screens', array( &$screen_function[0], $screen_function[1] ) );
     }
 }
@@ -244 +244 @@
     if ( $function = $bp->bp_nav[$parent_id]['screen_function'] ) {
         if ( !is_object( $function[0] ) ) {
-            remove_action( 'wp', $function, 3 );
+            remove_action( 'bp_screens', $function );
         } else {
-            remove_action( 'wp', array( &$function[0], $function[1] ), 3 );
+            remove_action( 'bp_screens', array( &$function[0], $function[1] ) );
         }
     }
@@ -267 +267 @@
     if ( $screen_function ) {
         if ( !is_object( $screen_function[0] ) )
-            remove_action( 'wp', $screen_function, 3 );
+            remove_action( 'bp_screens', $screen_function );
         else
-            remove_action( 'wp', array( &$screen_function[0], $screen_function[1] ), 3 );
+            remove_action( 'bp_screens', array( &$screen_function[0], $screen_function[1] ) );
     }
 
@@ -484 +484 @@
     _e( 'Notifications', 'buddypress' );
 
-    if ( $notifications = bp_users_get_notifications_for_user( $bp->loggedin_user->id ) ) { ?>
+    if ( $notifications = bp_members_get_notifications_for_user( $bp->loggedin_user->id ) ) { ?>
         <span><?php echo count( $notifications ) ?></span>
     <?php