X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fsubscriptions.php;h=566a053ead74e5a1d84e693b12fa0591311c92ef;hb=10f9a8a125c08dd403319aa84b4902db91253095;hp=37ed68a7f89abbfc21a7cd20041fc622a5498fa9;hpb=52600ce0b063e68e622b19699841e41b5ddbf2d1;p=quix0rs-gnu-social.git

diff --git a/actions/subscriptions.php b/actions/subscriptions.php
index 37ed68a7f8..566a053ead 100644
--- a/actions/subscriptions.php
+++ b/actions/subscriptions.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 SubscriptionsAction extends Action {
 
 	function handle($args) {
@@ -43,9 +48,11 @@ class SubscriptionsAction extends Action {
 		$subs = DB_DataObject::factory('subscription');
 		$subs->subscriber = $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();
 
@@ -54,24 +61,30 @@ class SubscriptionsAction extends Action {
 		$idx = 0;
 
 		while ($subs->fetch()) {
+			
 			$idx++;
 			if ($idx % SUBSCRIPTIONS_PER_ROW == 1) {
 				common_element_start('div', 'row');
 			}
 
-			common_element_start('a', array('title' => ($subs->fullname) ?
-											$subs->fullname :
-											$subs->nickname,
-											'href' => $subs->profileurl,
+			$other = Profile::staticGet($subs->subscribed);
+			
+			common_element_start('a', array('title' => ($other->fullname) ?
+											$other->fullname :
+											$other->nickname,
+											'href' => $other->profileurl,
 											'class' => 'subscription'));
-			$avatar = $subs->getAvatar(AVATAR_STREAM_SIZE);
-			common_element('img', array('src' => (($avatar) ? $avatar->url : DEFAULT_STREAM_AVATAR),
-										'width' => AVATAR_STREAM_SIZE,
-										'height' => AVATAR_STREAM_SIZE,
-										'class' => 'avatar stream',
-										'alt' => ($subs->fullname) ?
-										$subs->fullname :
-										$subs->nickname));
+			$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' => ($other->fullname) ?
+								 $other->fullname :
+								 $other->nickname));
 			common_element_end('a');
 
 			# XXX: subscribe form here