Changeset 2114 for trunk/bp-activity.php

Timestamp:

11/24/2009 10:05:01 PM (16 years ago)

Author:

apeatling

Message:

Merging 1.1 branch fixes into trunk.

File:

• trunk/bp-activity.php (modified) (2 diffs)

trunk/bp-activity.php

@@ -83 +83 @@
     bp_core_add_root_component( BP_ACTIVITY_SLUG );
 }
-add_action( 'plugins_loaded', 'bp_activity_setup_root_component', 2 );
+add_action( 'plugins_loaded', 'bp_activity_setup_root_component' );
 
 function bp_activity_setup_nav() {
@@ -126 +126 @@
 
 function bp_activity_screen_friends_activity() {
+    global $bp;
+
+    /* Make sure delete links do not show for friends activity items */
+    if ( !is_site_admin() )
+        $bp->is_item_admin = false;
+
     do_action( 'bp_activity_screen_friends_activity' );
     bp_core_load_template( apply_filters( 'bp_activity_template_friends_activity', 'activity/my-friends' ) );