X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fsubscribed.php;h=5527b276f35ce44fc25bd878aba7f8ae9c1734ca;hb=59db378c9304293c380778a1eb59ece5fbacb590;hp=e8df331ee67388905e3a60aab5e3491a99121b78;hpb=0f0d50f06a841e4faed475aa5f73f8bc08bb3a39;p=quix0rs-gnu-social.git diff --git a/actions/subscribed.php b/actions/subscribed.php index e8df331ee6..5527b276f3 100644 --- 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,6 +52,8 @@ 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), SUBSCRIPTIONS_PER_PAGE + 1); @@ -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