Merge branch '0.9.x' into 1.0.x

[quix0rs-gnu-social.git] / actions / subscriptions.php

diff --git a/actions/subscriptions.php b/actions/subscriptions.php
index 10e8f28608c27d0bb23762ef6d8ba3c62aa453d5..cfe2b5683a830673f7bda83c877ef768a2ac78a5 100644 (file)
--- a/actions/subscriptions.php
+++ b/actions/subscriptions.php
@@ -106,8 +106,6 @@ class SubscriptionsAction extends GalleryAction
                 }
             }
 
-            $subscriptions->free();
-
             $this->pagination($this->page > 1, $cnt > PROFILES_PER_PAGE,
                               $this->page, 'subscriptions',
                               array('nickname' => $this->user->nickname));
@@ -169,15 +167,14 @@ class SubscriptionsAction extends GalleryAction
      *
      * @return array of Feed objects
      */
-
     function getFeeds()
     {
         return array(new Feed(Feed::ATOM,
                               common_local_url('AtomPubSubscriptionFeed',
                                                array('subscriber' => $this->profile->id)),
+                              // TRANS: Atom feed title. %s is a profile nickname.
                               sprintf(_('Subscription feed for %s (Atom)'),
                                       $this->profile->nickname)));
-
     }
 }
 
@@ -265,5 +262,4 @@ class SubscriptionsListItem extends SubscriptionListItem
         $this->out->elementEnd('form');
         return;
     }
-
 }