Merge branch 'master' into social-master

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

diff --git a/lib/atomusernoticefeed.php b/lib/atomusernoticefeed.php
index d7f9b3d2337386f0bc5b770a0256a0b0c2d58deb..7b7f0a749f32910598d9b7c357b325422f95fdf3 100644 (file)
--- a/lib/atomusernoticefeed.php
+++ b/lib/atomusernoticefeed.php
@@ -63,11 +63,8 @@ class AtomUserNoticeFeed extends AtomNoticeFeed
             $profile = $user->getProfile();
 
             $ao = $profile->asActivityObject();
-
-            // quick fix until we start using Profile everywhere instead of User
-            $scoped = !is_null($cur) ? $cur->getProfile() : null;
-
-            array_push($ao->extra, $profile->profileInfo($scoped));
+            
+            array_push($ao->extra, $profile->profileInfo($this->scoped));
 
             $this->addAuthorRaw($ao->asString('author'));
         }