fix passing request around

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

diff --git a/actions/subscribed.php b/actions/subscribed.php
index 3218e07b868c71eb21f8685151692e1108086b66..5527b276f35ce44fc25bd878aba7f8ae9c1734ca 100644 (file)
--- a/actions/subscribed.php
+++ b/actions/subscribed.php
@@ -19,6 +19,11 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
+# XXX: make distinct from similar definitions in showstream.php
+
+define('SUBSCRIPTIONS_PER_ROW', 8);
+define('SUBSCRIPTIONS_PER_PAGE', 80);
+
 class SubscribedAction extends Action {
 
        # Who is subscribed to a given user?
@@ -47,9 +52,11 @@ class SubscribedAction extends Action {
                $subs = DB_DataObject::factory('subscription');
                $subs->subscribed = $profile->id;
 
+               $subs->orderBy('created DESC');
+
                # We ask for an extra one to know if we need to do another page
 
-               $subs->limit((($page-1)*SUBSCRIPTIONS_PER_PAGE)+1, SUBSCRIPTIONS_PER_PAGE + 1);
+               $subs->limit((($page-1)*SUBSCRIPTIONS_PER_PAGE), SUBSCRIPTIONS_PER_PAGE + 1);
 
                $subs_count = $subs->find();
 
@@ -63,19 +70,21 @@ class SubscribedAction extends Action {
                                common_element_start('div', 'row');
                        }
 
-                       common_element_start('a', array('title' => ($subs->fullname) ?
-                                                                                       $subs->fullname :
-                                                                                       $subs->nickname,
-                                                                                       'href' => $subs->profileurl,
+                       $other = Profile::staticGet($subs->subscriber);
+                       
+                       common_element_start('a', array('title' => ($other->fullname) ?
+                                                                                       $other->fullname :
+                                                                                       $other->nickname,
+                                                                                       'href' => $other->profileurl,
                                                                                        'class' => 'subscription'));
-                       $avatar = $subs->getAvatar(AVATAR_STREAM_SIZE);
+                       $avatar = $other->getAvatar(AVATAR_STREAM_SIZE);
                        common_element('img', array('src' => (($avatar) ? $avatar->url : common_default_avatar(AVATAR_STREAM_SIZE)),
                                                                                'width' => AVATAR_STREAM_SIZE,
                                                                                'height' => AVATAR_STREAM_SIZE,
                                                                                'class' => 'avatar stream',
-                                                                               'alt' => ($subs->fullname) ?
-                                                                                       $subs->fullname :
-                                                                                       $subs->nickname));
+                                                                               'alt' => ($other->fullname) ?
+                                                                                       $other->fullname :
+                                                                                       $other->nickname));
                        common_element_end('a');
 
                        # XXX: subscribe form here