X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fsubscribed.php;h=5527b276f35ce44fc25bd878aba7f8ae9c1734ca;hb=59db378c9304293c380778a1eb59ece5fbacb590;hp=160267838927b8f0ff47ab471fc52da6927292a2;hpb=52600ce0b063e68e622b19699841e41b5ddbf2d1;p=quix0rs-gnu-social.git

diff --git a/actions/subscribed.php b/actions/subscribed.php
index 1602678389..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?
@@ -42,13 +47,16 @@ class SubscribedAction extends Action {
 	}
 
 	function show_subscribed($profile, $page) {
-
+		global $config;
+		
 		$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();
 
@@ -62,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);
-			common_element('img', array('src' => (($avatar) ? $avatar->url : DEFAULT_STREAM_AVATAR),
+			$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