X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fsubscriptions.php;h=acc40d71628500fa4a8e118bb771dc640375a1ce;hb=bdb83be1790c089b8c236cc57c1448c787a7ecef;hp=f111d0be2e5a7180c0be884028fa4ab4bfcf64de;hpb=9933e1e341593b90fab6d366706710d604a1b43f;p=quix0rs-gnu-social.git

diff --git a/actions/subscriptions.php b/actions/subscriptions.php
index f111d0be2e..acc40d7162 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', 10);
+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,17 +61,20 @@ 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);
+			$avatar = $other->getAvatar(AVATAR_STREAM_SIZE);
 			common_element('img', 
 						   array('src' => 
 								 (($avatar) ? $avatar->url : 
@@ -72,9 +82,9 @@ class SubscriptionsAction extends Action {
 								 '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