X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fuseractivitystream.php;h=cc0e4297e6626c2c5ed8c7d65bbdcbf4707dac20;hb=0a4eeb89dab241779147c8c02a8f5f0f83533309;hp=a94fee21393e6414228e52abdd1528909a5f181e;hpb=38d9b4d3a492e64de969e31e5ab492bee52af908;p=quix0rs-gnu-social.git diff --git a/lib/useractivitystream.php b/lib/useractivitystream.php index a94fee2139..cc0e4297e6 100644 --- a/lib/useractivitystream.php +++ b/lib/useractivitystream.php @@ -108,6 +108,8 @@ class UserActivityStream extends AtomUserNoticeFeed $end = time() + 1; foreach ($this->objs as $obj) { + set_time_limit(10); + try { $act = $obj->asActivity(); } catch (Exception $e) { @@ -124,7 +126,7 @@ class UserActivityStream extends AtomUserNoticeFeed $notices = $this->getNoticesBetween($start, $end); foreach ($notices as $noticeAct) { try { - $nact = $noticeAct->asActivity($this->user); + $nact = $noticeAct->asActivity($this->user->getProfile()); if ($format == Feed::ATOM) { $nact->outputTo($this, false, false); } else { @@ -180,7 +182,7 @@ class UserActivityStream extends AtomUserNoticeFeed } foreach ($notices as $noticeAct) { try { - $nact = $noticeAct->asActivity($this->user); + $nact = $noticeAct->asActivity($this->user->getProfile()); if ($format == Feed::ATOM) { $nact->outputTo($this, false, false); } else { @@ -217,7 +219,6 @@ class UserActivityStream extends AtomUserNoticeFeed } } catch (Exception $e) { common_log(LOG_ERR, $e->getMessage()); - continue; } } }