Refs #2557 merged fix into trunk from 1.7 branch

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

2 files changed, 3 insertions, 12 deletions

diff --git a/engine/lib/group.php b/engine/lib/group.php
index 3b42de02f..1f2099dcd 100644
--- a/engine/lib/group.php
+++ b/engine/lib/group.php
@@ -801,15 +801,3 @@ function list_group_search($tag, $limit = 10) {
 	return elgg_view_entity_list($entities, $count, $offset, $limit, $fullview, false);
 
 }
-
-/**
- * Performs initialisation functions for groups
- *
- * @return void
- */
-function group_init() {
-	// Register an entity type
-	register_entity_type('group', '');
-}
-
-elgg_register_event_handler('init', 'system', 'group_init');
diff --git a/mod/groups/start.php b/mod/groups/start.php
index 92416a205..0abd48571 100644
--- a/mod/groups/start.php
+++ b/mod/groups/start.php
@@ -16,6 +16,9 @@ function groups_init() {
 
 	elgg_register_library('elgg:groups', elgg_get_plugin_path() . 'groups/lib/groups.php');
 
+	// register group entities for search
+	register_entity_type('group', '');
+
 	// Set up the menu
 	$item = new ElggMenuItem('groups', elgg_echo('groups'), 'pg/groups/all');
 	elgg_register_menu_item('site', $item);