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

Uncaught exception when no subscribers/subscriptions in ProfileList

Browse Source
This commit is contained in:
Mikael Nordfeldth 2013-09-26 00:47:56 +02:00
parent 858d9cc3c4
commit 80c6af0ffe
2 changed files with 14 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
classes/Memcached_DataObject.php
View File

@ -335,7 +335,7 @@ class Memcached_DataObject extends Safe_DataObject
$pkeyMap[$i->$keyCol][] = $pkeyVal; $pkeyMap[$i->$keyCol][] = $pkeyVal;
} }
} catch (NoResultException $e) { } catch (NoResultException $e) {
// no results foudn for our keyVals, so we leave them as empty arrays // no results found for our keyVals, so we leave them as empty arrays
} }
foreach ($toFetch as $keyVal) { foreach ($toFetch as $keyVal) {
self::cacheSet(sprintf("%s:list-ids:%s:%s", strtolower($cls), $keyCol, $keyVal), self::cacheSet(sprintf("%s:list-ids:%s:%s", strtolower($cls), $keyCol, $keyVal),

34
lib/profileaction.php
View File

@ -125,8 +125,6 @@ class ProfileAction extends Action
function showSubscriptions() function showSubscriptions()
{ {
$profile = $this->profile->getSubscribed(0, PROFILES_PER_MINILIST + 1);
$this->elementStart('div', array('id' => 'entity_subscriptions', $this->elementStart('div', array('id' => 'entity_subscriptions',
'class' => 'section')); 'class' => 'section'));
if (Event::handle('StartShowSubscriptionsMiniList', array($this))) { if (Event::handle('StartShowSubscriptionsMiniList', array($this))) {
@ -136,16 +134,14 @@ class ProfileAction extends Action
$this->text(' '); $this->text(' ');
$this->text($this->profile->subscriptionCount()); $this->text($this->profile->subscriptionCount());
$this->elementEnd('h2'); $this->elementEnd('h2');
$cnt = 0; try {
$profile = $this->profile->getSubscribed(0, PROFILES_PER_MINILIST + 1);
if (!empty($profile)) {
$pml = new ProfileMiniList($profile, $this); $pml = new ProfileMiniList($profile, $this);
$cnt = $pml->show(); $pml->show();
if ($cnt == 0) { } catch (NoResultException $e) {
// TRANS: Text for user subscription statistics if the user has no subscriptions. // TRANS: Text for user subscription statistics if the user has no subscription
$this->element('p', null, _('(None)')); $this->element('p', null, _('(None)'));
}
} }
Event::handle('EndShowSubscriptionsMiniList', array($this)); Event::handle('EndShowSubscriptionsMiniList', array($this));
@ -155,8 +151,6 @@ class ProfileAction extends Action
function showSubscribers() function showSubscribers()
{ {
$profile = $this->profile->getSubscribers(0, PROFILES_PER_MINILIST + 1);
$this->elementStart('div', array('id' => 'entity_subscribers', $this->elementStart('div', array('id' => 'entity_subscribers',
'class' => 'section')); 'class' => 'section'));
@ -169,15 +163,13 @@ class ProfileAction extends Action
$this->text($this->profile->subscriberCount()); $this->text($this->profile->subscriberCount());
$this->elementEnd('h2'); $this->elementEnd('h2');
$cnt = 0; try {
$profile = $this->profile->getSubscribers(0, PROFILES_PER_MINILIST + 1);
if (!empty($profile)) {
$sml = new SubscribersMiniList($profile, $this); $sml = new SubscribersMiniList($profile, $this);
$cnt = $sml->show(); $sml->show();
if ($cnt == 0) { } catch (NoResultException $e) {
// TRANS: Text for user subscriber statistics if user has no subscribers. // TRANS: Text for user subscriber statistics if user has no subscribers.
$this->element('p', null, _('(None)')); $this->element('p', null, _('(None)'));
}
} }
Event::handle('EndShowSubscribersMiniList', array($this)); Event::handle('EndShowSubscribersMiniList', array($this));