GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

get the correct data for subscribers/subscriptions 

darcs-hash:20080521193452-84dde-a1553941833cf3f11c53a6f493ad2dae975cc168.gz
This commit is contained in:
Evan Prodromou 2008-05-21 15:34:52 -04:00
parent 4b96241acf
commit ba5a3d476b
2 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
actions/subscribed.php
View File

@ -70,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

19
actions/subscriptions.php
View File

@ -61,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 :
@ -79,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