Changeset 2946 for trunk/bp-core.php

Timestamp:

04/21/2010 11:34:12 AM (16 years ago)

Author:

apeatling

Message:

Merging 1.2 branch with trunk

File:

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

trunk/bp-core.php

@@ -637 +637 @@
         'css_id' => $item_css_id,
         'show_for_displayed_user' => $show_for_displayed_user,
-        'position' => $position
+        'position' => $position,
+        'screen_function' => &$screen_function
     );
 
@@ -685 +686 @@
     $r = wp_parse_args( $args, $defaults );
     extract( $r, EXTR_SKIP );
+
+    if ( $function = $bp->bp_nav[$parent_slug]['screen_function'] ) {
+        if ( !is_object( $function[0] ) )
+            remove_action( 'wp', $function, 3 );
+        else
+            remove_action( 'wp', array( &$function[0], $function[1] ), 3 );
+    }
+
+    $bp->bp_nav[$parent_slug]['screen_function'] = &$screen_function;
 
     if ( $bp->current_component == $parent_slug && !$bp->current_action ) {
@@ -774 +784 @@
         'css_id' => $item_css_id,
         'position' => $position,
-        'user_has_access' => $user_has_access
+        'user_has_access' => $user_has_access,
+        'screen_function' => &$screen_function
     );
 
@@ -834 +845 @@
     }
 
+    if ( $function = $bp->bp_nav[$parent_id]['screen_function'] ) {
+        if ( !is_object( $function[0] ) )
+            remove_action( 'wp', $function, 3 );
+        else
+            remove_action( 'wp', array( &$function[0], $function[1] ), 3 );
+    }
+
     unset( $bp->bp_nav[$parent_id] );
 }
@@ -849 +867 @@
     global $bp;
 
-    $function = $bp->bp_options_nav[$parent_id][$slug]['screen_function'];
-
-    if ( $function ) {
-        if ( !is_object( $screen_function[0] ) )
-            remove_action( 'wp', $screen_function, 3 );
+    if ( $function = $bp->bp_options_nav[$parent_id][$slug]['screen_function'] ) {
+        if ( !is_object( $function[0] ) )
+            remove_action( 'wp', $function, 3 );
         else
-            remove_action( 'wp', array( &$screen_function[0], $screen_function[1] ), 3 );
+            remove_action( 'wp', array( &$function[0], $function[1] ), 3 );
     }
 
@@ -1842 +1858 @@
     wp_cache_flush();
 }
-add_action( 'wpmu_delete_user', 'bp_core_remove_data', 1 );
-add_action( 'delete_user', 'bp_core_remove_data', 1 );
-add_action( 'make_spam_user', 'bp_core_remove_data', 1 );
+add_action( 'wpmu_delete_user', 'bp_core_remove_data' );
+add_action( 'delete_user', 'bp_core_remove_data' );
+add_action( 'make_spam_user', 'bp_core_remove_data' );
 
 /**