Index: branches/RC/core/units/groups/groups_config.php
===================================================================
diff -u -r10902 -r11538
--- branches/RC/core/units/groups/groups_config.php	(.../groups_config.php)	(revision 10902)
+++ branches/RC/core/units/groups/groups_config.php	(.../groups_config.php)	(revision 11538)
@@ -6,7 +6,7 @@
 		'ItemClass' => Array ('class' => 'GroupsItem', 'file' => 'groups_item.php', 'build_event' => 'OnItemBuild'),
 		'ListClass' => Array ('class' => 'kDBList', 'file' => '', 'build_event' => 'OnListBuild'),
 		'EventHandlerClass' => Array ('class' => 'GroupsEventHandler', 'file' => 'groups_event_handler.php', 'build_event' => 'OnBuild'),
-		'TagProcessorClass' => Array ('class' => 'kDBTagProcessor', 'file' => '', 'build_event' => 'OnBuild'),
+		'TagProcessorClass' => Array ('class' => 'GroupTagProcessor', 'file' => 'group_tp.php', 'build_event' => 'OnBuild'),
 
 		'AutoLoad' => true,
 
@@ -30,31 +30,30 @@
 				'new_titlefield' => Array('g' => ''),
 			),
 
-			'groups_list' => Array ('prefixes' => Array ('g.total_List'), 'format' => "!la_title_Groups! (#g.total_recordcount#)"),
+			'group_list' => Array ('prefixes' => Array ('g.total_List'), 'format' => "!la_title_Groups!"),
 			'groups_edit' => Array ('prefixes' => Array ('g'), 'format' => "#g_status# '#g_titlefield#' - !la_title_General!"),
 			'groups_edit_users' => Array ('prefixes' => Array ('g', 'g-ug_List'), 'format' => "#g_status# '#g_titlefield#' - !la_title_Users! (#g-ug_recordcount#)" ),
 			'groups_edit_permissions' => Array ('prefixes' => Array ('g'), 'format' => "#g_status# '#g_titlefield#' - !la_title_Permissions!" ),
 			'groups_edit_additional_permissions' => Array ('prefixes' => Array ('g'), 'format' => "#g_status# '#g_titlefield#' - !la_title_AdditionalPermissions!" ),
-			'select_group' => Array('prefixes' => Array ('g.user_List'), 'format' => "!la_title_Groups! (#g.user_recordcount#) - !la_title_SelectGroup!"),
+			'select_group' => Array('prefixes' => Array ('g.user_List'), 'format' => "!la_title_Groups! - !la_title_SelectGroup!"),
 		),
 
+		'EditTabPresets' => Array (
+			'Default' => Array (
+				'general' => Array ('title' => 'la_tab_General', 't' => 'groups/groups_edit', 'priority' => 1),
+				'users' => Array ('title' => 'la_tab_Users', 't' => 'groups/groups_edit_users', 'priority' => 2),
+				'permissions' => Array ('title' => 'la_tab_Permissions', 't' => 'groups/groups_edit_permissions', 'priority' => 3),
+			),
+		),
+
 		'PermSection' => Array ('main' => 'in-portal:user_groups'),
 
 		'TableName' => TABLE_PREFIX.'PortalGroup',
 
 		'ListSQLs' => Array (
 			'' => 'SELECT %1$s.* %2$s FROM %1$s',
-			'total'	=> 'SELECT %1$s.* %2$s
-						FROM %1$s
-						LEFT JOIN '.TABLE_PREFIX.'UserGroup ug ON ug.GroupId = %1$s.GroupId',
 		),
 
-		'ItemSQLs' => Array (
-			'' => '	SELECT %1$s.* %2$s
-					FROM %1$s
-					LEFT JOIN '.TABLE_PREFIX.'UserGroup ug ON ug.GroupId = %1$s.GroupId'
-		),
-
 		'ListSortings' => Array (
 			'' => Array (
 				'Sorting' => Array ('Name' => 'asc'),
@@ -63,7 +62,7 @@
 
 		'CalculatedFields' => Array (
 			'total' => Array (
-				'UserCount' => 'COUNT(ug.PortalUserId)',
+				'UserCount' => 'SELECT COUNT(*) FROM ' . TABLE_PREFIX . 'UserGroup ug WHERE ug.GroupId = %1$s.GroupId',
 			),
 		),