wamo/Qvitter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

removes error in blocked-feed when we haven't blocked anyone

Browse Source
This commit is contained in:
Hannes Mannerheim 2016-02-16 19:20:44 +01:00
parent 4be6c25996
commit 0f9ec45a06
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
actions/apiqvitterblocks.php
View File

@ -109,14 +109,18 @@ class ApiQvitterBlocksAction extends ApiPrivateAuthAction
$blocks = QvitterBlocked::getBlocked($this->target->id, $offset, $limit); $blocks = QvitterBlocked::getBlocked($this->target->id, $offset, $limit);
$profiles = array(); if($blocks) {
$profiles = array();
while ($blocks->fetch()) { while ($blocks->fetch()) {
$this_profile_block = clone($blocks); $this_profile_block = clone($blocks);
$profiles[] = $this->getTargetProfile($this_profile_block->blocked); $profiles[] = $this->getTargetProfile($this_profile_block->blocked);
}
return $profiles;
} else {
return false;
} }
return $profiles;
} }
/** /**

7
classes/QvitterBlocked.php
View File

@ -49,7 +49,12 @@ class QvitterBlocked extends Profile_block
public static function getBlocked($profile_id, $offset = 0, $limit = PROFILES_PER_PAGE) public static function getBlocked($profile_id, $offset = 0, $limit = PROFILES_PER_PAGE)
{ {
$ids = self::getBlockedIDs($profile_id, $offset, $limit); $ids = self::getBlockedIDs($profile_id, $offset, $limit);
return Profile_block::listFind('blocked', $ids); try {
$blocked = Profile_block::listFind('blocked', $ids);
return $blocked;
} catch(NoResultException $e) {
return false;
}
} }