The front page now only shows content and groups.

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

2 files changed, 4 insertions, 5 deletions

diff --git a/engine/lib/entities.php b/engine/lib/entities.php
index 427dd5c7d..ee1066e99 100644
--- a/engine/lib/entities.php
+++ b/engine/lib/entities.php
@@ -1346,8 +1346,7 @@
 				
 		$where = array();
 		

-		if (is_array($type)) {

-			

+		if (is_array($type)) {			

 			$tempwhere = "";

 			if (sizeof($type))

 			foreach($type as $typekey => $subtypearray) {

@@ -2045,13 +2044,13 @@
 	 * @param true|false $viewtypetoggle Whether or not to allow gallery view 

 	 * @return string A viewable list of entities

 	 */

-	function list_registered_entities($owner_guid = 0, $limit = 10, $fullview = true, $viewtypetoggle = false) {

+	function list_registered_entities($owner_guid = 0, $limit = 10, $fullview = true, $viewtypetoggle = false, $allowedtypes = true) {

 		

 		$typearray = array();

 		

 		if ($object_types = get_registered_entity_types()) {

 			foreach($object_types as $object_type => $subtype_array) {

-				if (is_array($subtype_array) && sizeof($subtype_array))

+				if (is_array($subtype_array) && sizeof($subtype_array) && (in_array($object_type,$allowedtypes) || $allowedtypes === true))

 					foreach($subtype_array as $object_subtype) {

 						$typearray[$object_type][] = $object_subtype;

 					}

diff --git a/index.php b/index.php
index c9d966b2f..9ccf21b03 100644
--- a/index.php
+++ b/index.php
@@ -29,7 +29,7 @@
 	        	global $CONFIG;

 	        	$title = elgg_view_title(elgg_echo('content:latest'));

 	        	set_context('search');

-		        $content = list_registered_entities();

+		        $content = list_registered_entities(0,10,true,false,array('object','group'));

 		        set_context('main');

 		        global $autofeed;

 		        $autofeed = false;