UPDATE ActivityVerb

[quix0rs-gnu-social.git] / lib / useractivitystream.php

diff --git a/lib/useractivitystream.php b/lib/useractivitystream.php
index a0a2a26854e203a84d21680cbcd1ed6f7979be15..bb6048516403073752fe99b46090031612ec9243 100644 (file)
--- 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) {
@@ -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 {