diff --git a/core/datamodel.core.xml b/core/datamodel.core.xml index e0ae50829..6d5154bab 100644 --- a/core/datamodel.core.xml +++ b/core/datamodel.core.xml @@ -133,7 +133,7 @@ - + /** * * Create EventiTopNotification for each recipient diff --git a/sources/Controller/Newsroom/iTopNewsroomController.php b/sources/Controller/Newsroom/iTopNewsroomController.php index bf56f2171..8523c127b 100644 --- a/sources/Controller/Newsroom/iTopNewsroomController.php +++ b/sources/Controller/Newsroom/iTopNewsroomController.php @@ -56,12 +56,12 @@ class iTopNewsroomController extends Controller while($oMessage = $oSet->Fetch()) { $sTitle = $oMessage->Get('title'); - $Message = $oMessage->Get('message'); + $sMessage = $oMessage->Get('message'); $sText = <<Get('icon') !== null ? @@ -105,11 +105,11 @@ HTML; $oSearch = DBObjectSearch::FromOQL('SELECT EventiTopNotification WHERE contact_id = :contact_id AND read = "no"'); $oSet = new DBObjectSet($oSearch, array(), array('contact_id' => $iContactId)); - while($oMessage = $oSet->Fetch()) + while($oEvent = $oSet->Fetch()) { - $oMessage->Set('read', 'yes'); - $oMessage->Set('read_date', time()); - $oMessage->DBWrite(); + $oEvent->Set('read', 'yes'); + $oEvent->SetCurrentDate('read_date'); + $oEvent->DBWrite(); $iCount++; } } @@ -134,7 +134,7 @@ HTML; $oEvent = MetaModel::GetObject('EventiTopNotification', $sEventId); if($oEvent !== null && $oEvent->Get('contact_id') === UserRights::GetContactId()){ $oEvent->Set('read', 'yes'); - $oEvent->Set('read_date', time()); + $oEvent->SetCurrentDate('read_date'); $oEvent->DBWrite(); $sUrl = $oEvent->Get('url'); header("Location: $sUrl");