diff options
| -rw-r--r-- | engine/lib/entities.php | 4 | ||||
| -rw-r--r-- | engine/lib/users.php | 18 | ||||
| -rw-r--r-- | mod/members/pages/members/search.php | 9 |
3 files changed, 22 insertions, 9 deletions
diff --git a/engine/lib/entities.php b/engine/lib/entities.php index 82452fba1..f3bf9fb29 100644 --- a/engine/lib/entities.php +++ b/engine/lib/entities.php @@ -2162,8 +2162,8 @@ function elgg_list_registered_entities(array $options = array()) { $entities = array(); } - return elgg_view_entity_list($entities, $count, $options['offset'], - $options['limit'], $options['full_view'], $options['list_type_toggle'], $options['pagination']); + $options['count'] = $count; + return elgg_view_entity_list($entities, $options); } /** diff --git a/engine/lib/users.php b/engine/lib/users.php index c38bb676e..14cdd55d4 100644 --- a/engine/lib/users.php +++ b/engine/lib/users.php @@ -497,20 +497,26 @@ $timelower = 0, $timeupper = 0) { * @param int $timelower The earliest time the entity can have been created. Default: all * @param int $timeupper The latest time the entity can have been created. Default: all * - * @return string The list in a form suitable to display + * @return string */ function list_user_friends_objects($user_guid, $subtype = "", $limit = 10, $full_view = true, $listtypetoggle = true, $pagination = true, $timelower = 0, $timeupper = 0) { - $offset = (int) get_input('offset'); - $limit = (int) $limit; - $count = (int) count_user_friends_objects($user_guid, $subtype, $timelower, $timeupper); + $offset = (int)get_input('offset'); + $limit = (int)$limit; + $count = (int)count_user_friends_objects($user_guid, $subtype, $timelower, $timeupper); $entities = get_user_friends_objects($user_guid, $subtype, $limit, $offset, $timelower, $timeupper); - return elgg_view_entity_list($entities, $count, $offset, $limit, $full_view, - $listtypetoggle, $pagination); + return elgg_view_entity_list($entities, array( + 'count' => $count, + 'offset' => $offset, + 'limit' => $limit, + 'full_view' => $full_view, + 'list_type_toggle' => $listtypetoggle, + 'pagination' => $pagination, + )); } /** diff --git a/mod/members/pages/members/search.php b/mod/members/pages/members/search.php index 94127768a..1f0444d67 100644 --- a/mod/members/pages/members/search.php +++ b/mod/members/pages/members/search.php @@ -17,7 +17,14 @@ if ($vars['search_type'] == 'tag') { $results = elgg_trigger_plugin_hook('search', 'tags', $options, array()); $count = $results['count']; $users = $results['entities']; - $content = elgg_view_entity_list($users, $count, $offset, $limit, false, false, true); + $content = elgg_view_entity_list($users, array( + 'count' => $count, + 'offset' => $offset, + 'limit' => $limit, + 'full_view' => false, + 'list_type_toggle' => false, + 'pagination' => true, + )); } else { $name = sanitize_string(get_input('name')); |