diff options
| author | Cash Costello <cash.costello@gmail.com> | 2012-01-20 20:59:34 -0500 |
|---|---|---|
| committer | Cash Costello <cash.costello@gmail.com> | 2012-01-20 20:59:34 -0500 |
| commit | 1b15e9f33013cc5407ff7620989a3bb027348c41 (patch) | |
| tree | 02fb3d58d6ad7d6293e52d002b966f0a08f9822e /engine | |
| parent | b8d9fd50683965259f1836b959c74dc96f10a525 (diff) | |
| download | elgg-1b15e9f33013cc5407ff7620989a3bb027348c41.tar.gz elgg-1b15e9f33013cc5407ff7620989a3bb027348c41.tar.bz2 | |
Fixes #4303 passing arguments to elgg_view_entity_list in options array
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/lib/entities.php | 4 | ||||
| -rw-r--r-- | engine/lib/users.php | 18 |
2 files changed, 14 insertions, 8 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, + )); } /** |