Changeset 1062

Timestamp:

02/11/2009 08:08:26 PM (16 years ago)

Author:

apeatling

Message:

Fixes #340

Location:

trunk

Files:

• bp-activity/bp-activity-classes.php (modified) (2 diffs)
• bp-core.php (modified) (1 diff)
• bp-wire.php (modified) (1 diff)
• bp-wire/bp-wire-templatetags.php (modified) (1 diff)
• bp-xprofile.php (modified) (1 diff)

trunk/bp-activity/bp-activity-classes.php

@@ -46 +46 @@
         global $wpdb, $bp, $current_user;
 
-        if ( !$this->item_id || !$this->user_id || $this->is_private )
+        if ( !$this->item_id || !$this->user_id || $this->is_private || !$this->component_name )
             return false;
             
@@ -161 +161 @@
             $activities = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM {$bp->activity->table_name_current_user} WHERE date_recorded >= FROM_UNIXTIME(%d) $privacy_sql ORDER BY date_recorded DESC LIMIT 30", $since ) );
 
-            for ( $i = 0; $i < count( $activities ); $i++ ) {           
+            for ( $i = 0; $i < count( $activities ); $i++ ) {
+                
+                if ( !$activities[$i]->component_name ) continue;
+                        
                 if ( function_exists( $bp->{$activities[$i]->component_name}->format_activity_function ) ) {    
                     if ( !$content = call_user_func( $bp->{$activities[$i]->component_name}->format_activity_function, $activities[$i]->item_id, $activities[$i]->user_id, $activities[$i]->component_action, $activities[$i]->secondary_item_id ) )

trunk/bp-core.php

@@ -1297 +1297 @@
 
 /**
- * bp_core_ucfirst()
+ * bp_core_strip_username_spaces()
  * 
  * Strips spaces from usernames that are created using add_user() and wp_insert_user()

trunk/bp-wire.php

@@ -128 +128 @@
     $wire_post = new BP_Wire_Post( $table_name, $wire_post_id );
     
-    if ( !$bp->is_item_admin ) {
-        if ( $wire_post->user_id != $bp->loggedin_user->id )
-            return false;
+    if ( !is_site_admin() ) {
+        if ( !$bp->is_item_admin ) {
+            if ( $wire_post->user_id != $bp->loggedin_user->id )
+                return false;
+        }
     }
     

trunk/bp-wire/bp-wire-templatetags.php

@@ -302 +302 @@
         $uri = $bp->current_item;
         
-    if ( ( $wire_posts_template->wire_post->user_id == $bp->loggedin_user->id ) || $bp->is_item_admin ) {
+    if ( ( $wire_posts_template->wire_post->user_id == $bp->loggedin_user->id ) || $bp->is_item_admin || is_site_admin() ) {
         if ( $bp->wire->slug == $bp->current_component || $bp->profile->slug == $bp->current_component ) {
             echo apply_filters( 'bp_wire_delete_link', '<a href="' . wp_nonce_url( $bp->displayed_user->domain . $bp->wire->slug . '/delete/' . $wire_posts_template->wire_post->id, 'bp_wire_delete_link' ) . '">[' . __('Delete', 'buddypress') . ']</a>' );

trunk/bp-xprofile.php

@@ -419 +419 @@
     
     if ( $bp->current_action != 'delete' )
+        return false;
+    
+    if ( !check_admin_referer( 'bp_wire_delete_link' ) )
         return false;