Changeset 2753

Timestamp:

02/20/2010 12:32:00 PM (15 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.

Location:

branches/1.2

Files:

• bp-activity/bp-activity-templatetags.php (modified) (2 diffs)
• bp-core.php (modified) (1 diff)
• bp-themes/bp-default/activity/entry.php (modified) (1 diff)

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>';
 

branches/1.2/bp-core.php

@@ -106 +106 @@
     /* The core userdata of the user who is currently logged in. */
     $bp->loggedin_user->userdata = bp_core_get_core_userdata( $bp->loggedin_user->id );
+
+    /* is_site_admin() hits the DB on single WP installs, so we need to get this separately so we can call it in a loop. */
+    $bp->loggedin_user->is_site_admin = is_site_admin();
 
     /* The user id of the user currently being viewed, set in /bp-core/bp-core-catchuri.php */

branches/1.2/bp-themes/bp-default/activity/entry.php

@@ -16 +16 @@
         </div>
 
-        <?php if ( bp_get_activity_content_body() ) : ?>
+        <?php if ( bp_activity_has_content() ) : ?>
             <div class="activity-inner">
                 <?php bp_activity_content_body() ?>