Code cleanup and enabling User object's etc. getUri()

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

diff --git a/lib/useractivitystream.php b/lib/useractivitystream.php
index f4a771c5f0cbec97d6033d7051ca2f585811ef4b..ce3e373724e96451743682377a08f713854f73b3 100644 (file)
--- a/lib/useractivitystream.php
+++ b/lib/useractivitystream.php
@@ -154,7 +154,7 @@ class UserActivityStream extends AtomUserNoticeFeed
             try {
                 if ($format == Feed::ATOM) {
                     // Only show the author sub-element if it's different from default user
-                    $act->outputTo($this, false, ($act->actor->id != $this->user->uri));
+                    $act->outputTo($this, false, ($act->actor->id != $this->user->getUri()));
                 } else {
                     if ($haveOne) {
                         fwrite($handle, ",");
@@ -376,7 +376,7 @@ class UserActivityStream extends AtomUserNoticeFeed
 
     function getMessagesTo()
     {
-        $msgMap = Memcached_DataObject::listGet('Message', 'to_profile', array($this->user->id));
+        $msgMap = Message::listGet('to_profile', array($this->user->id));
 
         $messages = $msgMap[$this->user->id];
 
@@ -389,7 +389,7 @@ class UserActivityStream extends AtomUserNoticeFeed
 
     function getMessagesFrom()
     {
-        $msgMap = Memcached_DataObject::listGet('Message', 'from_profile', array($this->user->id));
+        $msgMap = Message::listGet('from_profile', array($this->user->id));
 
         $messages = $msgMap[$this->user->id];