only show "more subscriptions" link if there really are more subscriptions

darcs-hash:20080612192650-84dde-3bab08162d9e1e6def8712070c509306227ee645.gz
This commit is contained in:
Evan Prodromou 2008-06-12 15:26:50 -04:00
parent e13e58a9cf
commit 4449ff2051
1 changed files with 17 additions and 11 deletions

View File

@ -203,13 +203,12 @@ class ShowstreamAction extends StreamAction {
function show_subscriptions($profile) { function show_subscriptions($profile) {
global $config; global $config;
# XXX: add a limit
$subs = DB_DataObject::factory('subscription'); $subs = DB_DataObject::factory('subscription');
$subs->subscriber = $profile->id; $subs->subscriber = $profile->id;
# We ask for an extra one to know if we need to do another page # We ask for an extra one to know if we need to do another page
$subs->limit(0, SUBSCRIPTIONS); $subs->limit(0, SUBSCRIPTIONS + 1);
$subs_count = $subs->find(); $subs_count = $subs->find();
@ -221,7 +220,12 @@ class ShowstreamAction extends StreamAction {
common_element_start('ul', array('id' => 'subscriptions_avatars')); common_element_start('ul', array('id' => 'subscriptions_avatars'));
while ($subs->fetch()) { for ($i = 0; $i < min($subs_count, SUBSCRIPTIONS); $i++) {
if (!$subs->fetch()) {
common_debug('Weirdly, broke out of subscriptions loop early', __FILE__);
break;
}
$other = Profile::staticGet($subs->subscribed); $other = Profile::staticGet($subs->subscribed);
@ -242,17 +246,19 @@ class ShowstreamAction extends StreamAction {
common_element_end('a'); common_element_end('a');
common_element_end('li'); common_element_end('li');
} }
common_element_end('ul'); common_element_end('ul');
} }
common_element_start('p', array('id' => 'subscriptions_viewall')); if ($subs_count > SUBSCRIPTIONS) {
common_element_start('p', array('id' => 'subscriptions_viewall'));
common_element('a', array('href' => common_local_url('subscriptions',
array('nickname' => $profile->nickname)), common_element('a', array('href' => common_local_url('subscriptions',
'class' => 'moresubscriptions'), array('nickname' => $profile->nickname)),
_t('All subscriptions')); 'class' => 'moresubscriptions'),
_t('All subscriptions'));
common_element_end('p'); common_element_end('p');
}
common_element_end('div'); common_element_end('div');
} }