Changeset 2358

Timestamp:

01/19/2010 03:21:30 PM (16 years ago)

Author:

apeatling

Message:

Fixes #1581 - hiding "Load More" when total activity count does not hit the max per page.

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

@@ -187 +187 @@
 
                 return apply_filters( 'bp_get_activity_pagination_links', $activities_template->pag_links );
+        }
+
+function bp_activity_count() {
+        echo bp_get_activity_count();
+}
+        function bp_get_activity_count() {
+                global $activities_template;
+
+                return apply_filters( 'bp_get_activity_count', (int)$activities_template->activity_count );
+        }
+
+function bp_activity_per_page() {
+        echo bp_get_activity_per_page();
+}
+        function bp_get_activity_per_page() {
+                global $activities_template;
+
+                return apply_filters( 'bp_get_activity_per_page', (int)$activities_template->pag_num );
         }
 

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

@@ -15 +15 @@
         <?php endwhile; ?>
 
+        <?php if ( bp_get_activity_count() == bp_get_activity_per_page() ) : ?>
                 <li class="load-more">
                         <a href="#more"><?php _e( 'Load More', 'buddypress' ) ?></a> &nbsp; <span class="ajax-loader"></span>
                 </li>
+        <?php endif; ?>
 
         <?php if ( empty( $_POST['page'] ) ) : ?>