Merge branch '0.9.x' into 1.0.x

1 files changed, 17 insertions, 0 deletions

diff --git a/actions/subscriptions.php b/actions/subscriptions.php
index 45dbaf3b3..10e8f2860 100644
--- a/actions/subscriptions.php
+++ b/actions/subscriptions.php
@@ -163,6 +163,22 @@ class SubscriptionsAction extends GalleryAction
         $cloud2 = new SubscriptionsPeopleSelfTagCloudSection($this);
         $cloud2->show();
     }
+
+    /**
+     * Link to feeds of subscriptions
+     *
+     * @return array of Feed objects
+     */
+
+    function getFeeds()
+    {
+        return array(new Feed(Feed::ATOM,
+                              common_local_url('AtomPubSubscriptionFeed',
+                                               array('subscriber' => $this->profile->id)),
+                              sprintf(_('Subscription feed for %s (Atom)'),
+                                      $this->profile->nickname)));
+
+    }
 }
 
 // XXX SubscriptionsList and SubscriptionList are dangerously close
@@ -249,4 +265,5 @@ class SubscriptionsListItem extends SubscriptionListItem
         $this->out->elementEnd('form');
         return;
     }
+
 }