Changeset 2753 for branches/1.2/bp-activity/bp-activity-templatetags.php

Timestamp:

02/20/2010 12:32:00 PM (14 years ago)

Author:

apeatling

Message:

Fixed duplicate database hits when calling is_site_admin() in a loop on single WP installs. Fixed duplicate call to bp_activity_content_body() causing issues with filters.

File:

• branches/1.2/bp-activity/bp-activity-templatetags.php (modified) (2 diffs)

branches/1.2/bp-activity/bp-activity-templatetags.php

@@ -460 +460 @@
     }
 
+    function bp_activity_has_content() {
+        global $activities_template;
+
+        if ( !empty( $activities_template->activity->content ) )
+            return true;
+
+        return false;
+    }
+
 function bp_activity_content() {
     echo bp_get_activity_content();
@@ -574 +583 @@
 
                 /* Delete link */
-                if ( is_site_admin() || $bp->loggedin_user->id == $comment->user_id )
+                if ( $bp->loggedin_user->is_site_admin || $bp->loggedin_user->id == $comment->user_id )
                     $content .= ' &middot; <a href="' . wp_nonce_url( $bp->root_domain . '/' . $bp->activity->slug . '/delete/?cid=' . $comment->id, 'bp_activity_delete_link' ) . '" class="delete acomment-delete">' . __( 'Delete', 'buddypress' ) . '</a>';