Index: branches/5.2.x/core/units/user_groups/user_groups_config.php =================================================================== diff -u -N -r14726 -r15012 --- branches/5.2.x/core/units/user_groups/user_groups_config.php (.../user_groups_config.php) (revision 14726) +++ branches/5.2.x/core/units/user_groups/user_groups_config.php (.../user_groups_config.php) (revision 15012) @@ -1,6 +1,6 @@ Array( '' => ' SELECT %1$s.* %2$s FROM %1$s - LEFT JOIN '.TABLE_PREFIX.'PortalGroup g ON %1$s.GroupId = g.GroupId - LEFT JOIN '.TABLE_PREFIX.'PortalUser u ON %1$s.PortalUserId = u.PortalUserId' + LEFT JOIN '.TABLE_PREFIX.'UserGroups g ON %1$s.GroupId = g.GroupId + LEFT JOIN '.TABLE_PREFIX.'Users u ON %1$s.PortalUserId = u.PortalUserId' ), 'ItemSQLs' => Array( '' => ' SELECT %1$s.* %2$s FROM %1$s - LEFT JOIN '.TABLE_PREFIX.'PortalGroup g ON %1$s.GroupId = g.GroupId - LEFT JOIN '.TABLE_PREFIX.'PortalUser u ON %1$s.PortalUserId = u.PortalUserId' + LEFT JOIN '.TABLE_PREFIX.'UserGroups g ON %1$s.GroupId = g.GroupId + LEFT JOIN '.TABLE_PREFIX.'Users u ON %1$s.PortalUserId = u.PortalUserId' ), 'CalculatedFields' => Array ( '' => Array( @@ -82,12 +82,12 @@ 'IDField' => 'GroupId', 'TitleField' => 'GroupName', - 'TableName' => TABLE_PREFIX.'UserGroup', + 'TableName' => TABLE_PREFIX.'UserGroupRelations', 'ListSQLs' => Array( ''=>' SELECT %1$s.* %2$s FROM %1$s - LEFT JOIN '.TABLE_PREFIX.'PortalGroup g ON %1$s.GroupId = g.GroupId - LEFT JOIN '.TABLE_PREFIX.'%3$sPortalUser u ON %1$s.PortalUserId = u.PortalUserId'), + LEFT JOIN '.TABLE_PREFIX.'UserGroups g ON %1$s.GroupId = g.GroupId + LEFT JOIN '.TABLE_PREFIX.'%3$sUsers u ON %1$s.PortalUserId = u.PortalUserId'), 'AutoDelete' => true, 'AutoClone' => false,