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

Fixes some non-defined variables in commit eb2f93a

Browse Source
This commit is contained in:
Mikael Nordfeldth
2014-07-28 10:57:45 +02:00
parent 483b2d3d29
commit 89704bcdee
3 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/activitystreamjsondocument.php
View File

@@ -54,6 +54,7 @@ class ActivityStreamJSONDocument extends JSONActivityCollection
/* The current authenticated user */
protected $cur;
protected $scoped = null;
/* Title of the document */
protected $title;
@@ -75,7 +76,8 @@ class ActivityStreamJSONDocument extends JSONActivityCollection
{
parent::__construct($items, $url);
$this->cur = $cur;
$this->cur = $cur ?: common_current_user();
$this->scoped = !is_null($this->cur) ? $this->cur->getProfile() : null;
/* Title of the JSON document */
$this->title = $title;
@@ -138,10 +140,8 @@ class ActivityStreamJSONDocument extends JSONActivityCollection
function addItemFromNotice($notice)
{
$cur = empty($this->cur) ? common_current_user() : $this->cur;
$act = $notice->asActivity($cur);
$act->extra[] = $notice->noticeInfo($cur->getProfile());
$act = $notice->asActivity($this->scoped);
$act->extra[] = $notice->noticeInfo($this->scoped);
array_push($this->items, $act->asArray());
$this->count++;
}