Index: trunk/kernel/include/portalgroup.php =================================================================== diff -u -r2082 -r3983 --- trunk/kernel/include/portalgroup.php (.../portalgroup.php) (revision 2082) +++ trunk/kernel/include/portalgroup.php (.../portalgroup.php) (revision 3983) @@ -224,11 +224,11 @@ break; case 'membership_expires_date': - return $this->Get('MembershipExpires') <= 0 ? '' : LangDate( $this->Get('MembershipExpires') ); + return $this->Get('MembershipExpires') <= 0 ? '' : LangDate( $this->Get('MembershipExpires'), 0, true ); break; case 'membership_expires_time': - return $this->Get('MembershipExpires') <= 0 ? '' : LangTime( $this->Get('MembershipExpires') ); + return $this->Get('MembershipExpires') <= 0 ? '' : LangTime( $this->Get('MembershipExpires'), 0, true ); break; case "group_id": @@ -458,9 +458,9 @@ $edit_table = $objSession->GetEditTable($this->SourceTable); $sql = "SELECT * FROM $edit_table"; + $item_ids = Array(); $rs = $this->adodbConnection->Execute($sql); - while($rs && !$rs->EOF) - { + while ($rs && !$rs->EOF) { $data = $rs->fields; $c = new $this->classname; $c->SetFromArray($data); @@ -478,14 +478,15 @@ $sql = "UPDATE ".GetTablePrefix()."Permissions SET GroupId=".$c->Get("GroupId")." WHERE GroupId=$old_id"; $this->adodbConnection->Execute($sql); } - $c->Update(); + $item_ids[] = $c->UniqueId(); unset($c); unset($r); $rs->MoveNext(); } @$this->adodbConnection->Execute("DROP TABLE IF EXISTS $edit_table"); unset($GLOBALS['_CopyFromEditTable']); + return $item_ids; } function PurgeEditTable($idfield)