Skip to content

Commit

Permalink
Fix loading and activity warning
Browse files Browse the repository at this point in the history
Signed-off-by: Julius Härtl <jus@bitgrid.net>
  • Loading branch information
juliusknorr committed Nov 10, 2018
1 parent 24db3fb commit a569078
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 3 deletions.
6 changes: 5 additions & 1 deletion lib/Activity/DeckProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,11 @@ protected function setSubjects(IEvent $event, $subject, array $parameters) {
$placeholders = $replacements = [];
foreach ($parameters as $placeholder => $parameter) {
$placeholders[] = '{' . $placeholder . '}';
$replacements[] = $parameter['name'];
if (array_key_exists('name', $parameter)) {
$replacements[] = $parameter['name'];
} else {
$replacements[] = '';
}
}

$event->setParsedSubject(str_replace($placeholders, $replacements, $subject))
Expand Down
2 changes: 1 addition & 1 deletion lib/Service/BoardService.php
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ public function __construct(
/**
* @return array
*/
public function findAll($since = 0) {
public function findAll($since = -1) {
$userInfo = $this->getBoardPrerequisites();
$userBoards = $this->boardMapper->findAllByUser($userInfo['user'], null, null, $since);
$groupBoards = $this->boardMapper->findAllByGroups($userInfo['user'], $userInfo['groups'],null, null, $since);
Expand Down
2 changes: 1 addition & 1 deletion lib/Service/StackService.php
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ public function find($stackId) {
* @throws \OCA\Deck\NoPermissionException
* @throws BadRequestException
*/
public function findAll($boardId, $since = 0) {
public function findAll($boardId, $since = -1) {
if (is_numeric($boardId) === false) {
throw new BadRequestException('boardId must be a number');
}
Expand Down

0 comments on commit a569078

Please sign in to comment.