GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

UAS protected property user solved with getUser()

Browse Source
This commit is contained in:
Mikael Nordfeldth 2015-02-13 11:39:50 +01:00
parent a063bb43a8
commit cdf2b28854
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/DirectMessage/DirectMessagePlugin.php
View File

@ -58,16 +58,16 @@ class DirectMessagePlugin extends Plugin
public function onAppendUserActivityStreamObjects(UserActivityStream $uas, array &$objs)
{
// Messages _from_ the user
$msgMap = Message::listGet('from_profile', array($this->user->id));
$messages = $msgMap[$uas->user->id];
$msgMap = Message::listGet('from_profile', array($uas->getUser()->id));
$messages = $msgMap[$uas->getUser()->id];
if (!empty($uas->after)) {
$messages = array_filter($messages, array($uas, 'createdAfter'));
}
$objs[] = $messages;
// Messages _to_ the user
$msgMap = Message::listGet('to_profile', array($this->user->id));
$messages = $msgMap[$uas->user->id];
$msgMap = Message::listGet('to_profile', array($uas->getUser()->id));
$messages = $msgMap[$uas->getUser()->id];
if (!empty($uas->after)) {
$messages = array_filter($messages, array($uas, 'createdAfter'));
}