Merge branch 'activityhooks' into 0.9.x

Conflicts: classes/Notice.php
2010-08-03 16:01:18 -07:00
parent f9a4728fcc cc71f1ae82
commit 2ba36fc242
5 changed files with 1096 additions and 131 deletions
--- a/plugins/OStatus/OStatusPlugin.php
+++ b/plugins/OStatus/OStatusPlugin.php
@@ -956,4 +956,16 @@ class OStatusPlugin extends Plugin
        }
        return false;
    }
+
+    public function onStartProfileGetAtomFeed($profile, &$feed)
+    {
+        $oprofile = Ostatus_profile::staticGet('profile_id', $profile->id);
+
+        if (empty($oprofile)) {
+            return true;
+        }
+
+        $feed = $oprofile->feeduri;
+        return false;
+    }
 }