From 8e6b52e8994ce9a3180554f999bdc89b414fc892 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Fri, 12 Feb 2010 00:22:16 +0000
Subject: OStatus: renamed feedinfo table to ostatus_profile -- will cover
 remote ostatus people and groups whether a subscription's active or not
 (maintains identity over unsub/resub, and between subscribers and
 subscribees)

---
 plugins/OStatus/lib/feedmunger.php | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

(limited to 'plugins/OStatus/lib')

diff --git a/plugins/OStatus/lib/feedmunger.php b/plugins/OStatus/lib/feedmunger.php
index 927a2fe7a..c895b6ce2 100644
--- a/plugins/OStatus/lib/feedmunger.php
+++ b/plugins/OStatus/lib/feedmunger.php
@@ -83,17 +83,17 @@ class FeedMunger
         $this->url = $url;
     }
     
-    function feedinfo()
+    function ostatusProfile()
     {
-        $feedinfo = new Feedinfo();
-        $feedinfo->feeduri = $this->url;
-        $feedinfo->homeuri = $this->feed->link;
-        $feedinfo->huburi = $this->getHubLink();
+        $profile = new Ostatus_profile();
+        $profile->feeduri = $this->url;
+        $profile->homeuri = $this->feed->link;
+        $profile->huburi = $this->getHubLink();
         $salmon = $this->getSalmonLink();
         if ($salmon) {
-            $feedinfo->salmonuri = $salmon;
+            $profile->salmonuri = $salmon;
         }
-        return $feedinfo;
+        return $profile;
     }
 
     function getAtomLink($item, $attribs=array())
@@ -258,9 +258,7 @@ class FeedMunger
     {
         // hack hack hack
         // should get profile for this entry's author...
-        $feed = new Feedinfo();
-        $feed->feeduri = $self;
-        $feed = Feedinfo::staticGet('feeduri', $this->getSelfLink());
+        $remote = Ostatus_profile::staticGet('feeduri', $this->getSelfLink());
         if ($feed) {
             return $feed->profile_id;
         } else {
-- 
cgit v1.2.3-54-g00ecf