diff options
| -rw-r--r-- | actions/subscribed.php | 18 | ||||
| -rw-r--r-- | actions/subscriptions.php | 19 |
2 files changed, 21 insertions, 16 deletions
diff --git a/actions/subscribed.php b/actions/subscribed.php index 634ca4102..6968b97cb 100644 --- a/actions/subscribed.php +++ b/actions/subscribed.php @@ -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 diff --git a/actions/subscriptions.php b/actions/subscriptions.php index 51f35750c..acc40d716 100644 --- a/actions/subscriptions.php +++ b/actions/subscriptions.php @@ -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 |