Hidden viewtype toggle on search.

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

2 files changed, 6 insertions, 4 deletions

diff --git a/engine/lib/elgglib.php b/engine/lib/elgglib.php
index 8fc1b3da9..6d61dfb9e 100644
--- a/engine/lib/elgglib.php
+++ b/engine/lib/elgglib.php
@@ -467,10 +467,10 @@
 	 * @param int $offset The current indexing offset

 	 * @param int $limit The number of entities to display per page

 	 * @param true|false $fullview Whether or not to display the full view (default: true)

-	 * @param string $viewtype "list" or "gallery" for search pages only (default: "list")

+	 * @param true|false $viewtypetoggle Whether or not to allow users to toggle to gallery view

 	 * @return string The list of entities

 	 */

-		function elgg_view_entity_list($entities, $count, $offset, $limit, $fullview = true, $viewtype = "list") {

+		function elgg_view_entity_list($entities, $count, $offset, $limit, $fullview = true, $viewtypetoggle = true) {

 			

 			$count = (int) $count;

 			$offset = (int) $offset;

@@ -486,6 +486,7 @@
 													'baseurl' => $_SERVER['REQUEST_URI'],

 													'fullview' => $fullview,

 													'context' => $context, 

+													'viewtypetoggle' => $viewtypetoggle,

 													'viewtype' => get_input('search_viewtype','list'), 

 												  ));

 				

diff --git a/engine/lib/metadata.php b/engine/lib/metadata.php
index 51b3c03d9..0bfbebd70 100644
--- a/engine/lib/metadata.php
+++ b/engine/lib/metadata.php
@@ -534,17 +534,18 @@
 	 * @param string $entity_subtype The subtype of the entity

 	 * @param int $limit Number of entities to display per page

 	 * @param true|false $fullview Whether or not to display the full view (default: true)

+	 * @param true|false $viewtypetoggle Whether or not to allow users to toggle to the gallery view

 	 * 

 	 * @return string A list of entities suitable for display

 	 */

-	function list_entities_from_metadata($meta_name, $meta_value = "", $entity_type = "", $entity_subtype = "", $owner_guid = 0, $limit = 10, $fullview = true) {

+	function list_entities_from_metadata($meta_name, $meta_value = "", $entity_type = "", $entity_subtype = "", $owner_guid = 0, $limit = 10, $fullview = true, $viewtypetoggle = true) {

 		

 		$offset = (int) get_input('offset');

 		$limit = (int) $limit;

 		$count = get_entities_from_metadata($meta_name, $meta_value, $entity_type, $entity_subtype, $owner_guid, $limit, $offset, "", 0, true);

 		$entities = get_entities_from_metadata($meta_name, $meta_value, $entity_type, $entity_subtype, $owner_guid, $limit, $offset, "", 0, false);

 		

-		return elgg_view_entity_list($entities, $count, $offset, $limit, $fullview);

+		return elgg_view_entity_list($entities, $count, $offset, $limit, $fullview, $viewtypetoggle);

 		

 	}