Changeset 3670

Timestamp:

01/08/2011 04:51:59 PM (14 years ago)

Author:

boonebgorges

Message:

Corrects logic for showing 'Load More' link on activity loop. Fixes #1757

Location:

trunk

Files:

• bp-activity/bp-activity-templatetags.php (modified) (1 diff)
• bp-themes/bp-default/activity/activity-loop.php (modified) (1 diff)

trunk/bp-activity/bp-activity-templatetags.php

@@ -316 +316 @@
         return apply_filters( 'bp_get_activity_pagination_links', $activities_template->pag_links );
     }
+
+/**
+ * Returns true when there are more activity items to be shown than currently appear
+ *
+ * @package BuddyPress Activity
+ * @since 1.3
+ *
+ * @global $activities_template The activity data loop object created in bp_has_activities()
+ */
+function bp_activity_has_more_items() {
+    global $activities_template;
+    
+    $remaining_pages = floor( ( $activities_template->total_activity_count - 1 ) / ( $activities_template->pag_num * $activities_template->pag_page ) ); 
+    
+    $has_more_items = (int)$remaining_pages ? true : false;
+    
+    return apply_filters( 'bp_activity_has_more_items', $has_more_items );
+}
 
 function bp_activity_count() {

trunk/bp-themes/bp-default/activity/activity-loop.php

@@ -23 +23 @@
     <?php endwhile; ?>
 
-    <?php if ( bp_get_activity_count() == bp_get_activity_per_page() ) : ?>
+    <?php if ( bp_activity_has_more_items() ) : ?>
         <li class="load-more">
             <a href="#more"><?php _e( 'Load More', 'buddypress' ) ?></a> &nbsp; <span class="ajax-loader"></span>