Fixed routing for direct messages and favorites in the API

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

diff --git a/actions/subscriptions.php b/actions/subscriptions.php
index 8d1462d494ba1446fb673bc25cae9015366e645e..3fbea2039d29ec3250acf1b20a2471d99b4288d1 100644 (file)
--- a/actions/subscriptions.php
+++ b/actions/subscriptions.php
@@ -84,11 +84,17 @@ class SubscriptionsAction extends GalleryAction
         $offset = ($this->page-1) * PROFILES_PER_PAGE;
         $limit =  PROFILES_PER_PAGE + 1;
 
-        $subscriptions = $this->user->getSubscriptions($offset, $limit);
+        $cnt = 0;
+
+        if ($this->tag) {
+            $subscriptions = $this->user->getTaggedSubscriptions($this->tag, $offset, $limit);
+        } else {
+            $subscriptions = $this->user->getSubscriptions($offset, $limit);
+        }
 
         if ($subscriptions) {
             $subscriptions_list = new SubscriptionsList($subscriptions, $this->user, $this);
-            $subscriptions_list->show();
+            $cnt = $subscriptions_list->show();
         }
 
         $subscriptions->free();
@@ -111,7 +117,7 @@ class SubscriptionsList extends ProfileList
 
         $this->out->elementStart('form', array('id' => 'subedit-' . $profile->id,
                                           'method' => 'post',
-                                          'class' => 'subedit',
+                                          'class' => 'form_subcription_edit',
                                           'action' => common_local_url('subedit')));
         $this->out->hidden('token', common_session_token());
         $this->out->hidden('profile', $profile->id);