Fixes #2606: Abstracted elgg_list_entities. Takes an optional second argument for the 'getter', defaulting to 'elgg_get_entities'. Converted current elgg_list_entities* functions to use it

git-svn-id: http://code.elgg.org/elgg/trunk@7212 36083f99-b078-4883-b0ff-0f9b5a30f544

1 files changed, 1 insertions, 15 deletions

diff --git a/engine/lib/metadata.php b/engine/lib/metadata.php
index b0117bfd0..77267d8a2 100644
--- a/engine/lib/metadata.php
+++ b/engine/lib/metadata.php
@@ -1021,21 +1021,7 @@ $pagination = true, $case_sensitive = true) {
  * @since 1.7.0
  */
 function elgg_list_entities_from_metadata($options) {
-	$defaults = array(
-		'offset' => (int) max(get_input('offset', 0), 0),
-		'limit' => (int) max(get_input('limit', 10), 0),
-		'full_view' => TRUE,
-		'view_type_toggle' => FALSE,
-		'pagination' => TRUE
-	);
-
-	$options = array_merge($defaults, $options);
-
-	$count = elgg_get_entities_from_metadata(array_merge(array('count' => TRUE), $options));
-	$entities = elgg_get_entities_from_metadata($options);
-
-	return elgg_view_entity_list($entities, $count, $options['offset'], $options['limit'],
-		$options['full_view'], $options['view_type_toggle'], $options['pagination']);
+	return elgg_list_entities($options, 'elgg_get_entities_from_metadata');
 }
 
 /**