Refs #1253 using 'list_type' string instead of boolean 'gallery' for entity listing

2 files changed, 17 insertions, 15 deletions

diff --git a/engine/lib/entities.php b/engine/lib/entities.php
index cb197b569..10313fc8c 100644
--- a/engine/lib/entities.php
+++ b/engine/lib/entities.php
@@ -1190,10 +1190,10 @@ $time_created_lower = NULL, $time_updated_upper = NULL, $time_updated_lower = NU
  * @internal This also provides the views for elgg_view_annotation().
  *
  * @param array $options Any options from $getter options plus:
- * 	 full_view => BOOL Display full view entities
- * 	 list_type_toggle => BOOL Display gallery / list switch
- * 	 pagination => BOOL Display pagination links
- *   gallery => BOOL display in gallery view
+ *	full_view => BOOL Display full view entities
+ *	list_type => STR 'list' or 'gallery'
+ *	list_type_toggle => BOOL Display gallery / list switch
+ *	pagination => BOOL Display pagination links
  *
  * @param mixed $getter  The entity getter function to use to fetch the entities
  * @param mixed $viewer  The function to use to view the entity list.
@@ -1216,7 +1216,6 @@ function elgg_list_entities(array $options = array(), $getter = 'elgg_get_entiti
 		'full_view' => TRUE,
 		'list_type_toggle' => FALSE,
 		'pagination' => TRUE,
-		'gallery' => FALSE,
 	);
 
 	$options = array_merge($defaults, $options);
diff --git a/engine/lib/views.php b/engine/lib/views.php
index df69593f9..7358fc0ba 100644
--- a/engine/lib/views.php
+++ b/engine/lib/views.php
@@ -950,9 +950,10 @@ function elgg_view_annotation(ElggAnnotation $annotation, array $vars = array(),
  *		'offset'           The current indexing offset
  *		'limit'            The number of entities to display per page
  *		'full_view'        Display the full view of the entities?
- *		'list_class'       CSS Class applied to the list
+ *		'list_class'       CSS class applied to the list
+ *		'item_class'       CSS class applied to the list items
  *		'pagination'       Display pagination?
- *		'gallery'          Display as gallery?
+ *		'list_type'        List type: 'list' (default), 'gallery'
  *		'list_type_toggle' Display the list type toggle?
  *
  * @return string The rendered list of entities
@@ -965,6 +966,13 @@ $list_type_toggle = true, $pagination = true) {
 		$offset = (int)get_input('offset', 0);
 	}
 
+	// list type can be passed as request parameter
+	$list_type = get_input('list_type', 'list');
+	if (get_input('listtype')) {
+		elgg_deprecated_notice("'listtype' has been deprecated by 'list_type' for lists", 1.8);
+		$list_type = get_input('listtype');
+	}
+
 	if (is_array($vars)) {
 		// new function
 		$defaults = array(
@@ -972,7 +980,7 @@ $list_type_toggle = true, $pagination = true) {
 			'list_class' => 'elgg-list-entity',
 			'full_view' => true,
 			'pagination' => true,
-			'gallery' => false,
+			'list_type' => $list_type,
 			'list_type_toggle' => false,
 			'offset' => $offset,
 		);
@@ -990,18 +998,13 @@ $list_type_toggle = true, $pagination = true) {
 			'limit' => (int) $limit,
 			'full_view' => $full_view,
 			'pagination' => $pagination,
-			'gallery' => false,
+			'list_type' => $list_type,
 			'list_type_toggle' => $list_type_toggle,
 			'list_class' => 'elgg-list-entity',
 		);
 	}
 
-	$listtype = get_input('listtype', 'list');
-	if ($listtype != 'list') {
-		$vars['gallery'] = true;
-	}
-
-	if ($vars['gallery']) {
+	if ($vars['list_type'] != 'list') {
 		return elgg_view('page/components/gallery', $vars);
 	} else {
 		return elgg_view('page/components/list', $vars);