get the correct data for subscribers/subscriptions

darcs-hash:20080521193452-84dde-a1553941833cf3f11c53a6f493ad2dae975cc168.gz

diff --git a/actions/subscribed.php b/actions/subscribed.php
index 634ca41022dd4e3faf5f8d068a653cd4546c7c4a..6968b97cbcfadbcc34257b155932a71c482eeef9 100644 (file)
--- 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 51f35750c3ea7266a784fbf2d2de4f0aa89247f8..acc40d71628500fa4a8e118bb771dc640375a1ce 100644 (file)
--- 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