Index: branches/5.2.x/core/units/user_groups/user_groups_eh.php =================================================================== diff -u -N -r14628 -r15012 --- branches/5.2.x/core/units/user_groups/user_groups_eh.php (.../user_groups_eh.php) (revision 14628) +++ branches/5.2.x/core/units/user_groups/user_groups_eh.php (.../user_groups_eh.php) (revision 15012) @@ -1,6 +1,6 @@ Application->GetVar('u_id'); - $table_name = $this->Application->GetTempName(TABLE_PREFIX.'UserGroup', 'prefix:u'); + $table_name = $this->Application->GetTempName(TABLE_PREFIX.'UserGroupRelations', 'prefix:u'); $sql = 'SELECT GroupId FROM '.$table_name.' @@ -63,7 +63,7 @@ // don't insert duplicate group membership record $group_id = $this->Application->GetVar('g_id'); - $table_name = $this->Application->GetTempName(TABLE_PREFIX.'UserGroup', 'prefix:g'); + $table_name = $this->Application->GetTempName(TABLE_PREFIX.'UserGroupRelations', 'prefix:g'); $sql = 'SELECT PortalUserId FROM ' . $table_name . ' @@ -126,7 +126,7 @@ if ($event->Prefix == 'u-ug') { // allow deleting non-primary group of current user ($ids - groups) $sql = 'SELECT PrimaryGroupId - FROM ' . $this->Application->GetTempName(TABLE_PREFIX . 'PortalUser', 'prefix:u') . ' + FROM ' . $this->Application->GetTempName(TABLE_PREFIX . 'Users', 'prefix:u') . ' WHERE PortalUserId = ' . (int)$this->Application->GetVar('u_id'); $primary_group_id = (int)$this->Conn->GetOne($sql); @@ -142,7 +142,7 @@ $group_id = (int)$this->Application->GetVar('g_id'); $sql = 'SELECT PortalUserId - FROM ' . TABLE_PREFIX . 'PortalUser' . ' + FROM ' . TABLE_PREFIX . 'Users WHERE PortalUserId IN (' . implode(',', $ids) . ') AND PrimaryGroupId = ' . $group_id; $exclude_users = $this->Conn->GetCol($sql);