revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-12-25 15:00:58 +01:00
Code Issues Releases Wiki Activity

Merge branch 'master' into redesign-2015

Browse source
This commit is contained in:
epriestley 2015-06-25 15:55:04 -07:00
commit 5f84f14eab
2 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/applications/calendar/query/PhabricatorCalendarEventSearchEngine.php
View file

@ -228,9 +228,11 @@ final class PhabricatorCalendarEventSearchEngine
case 'day': case 'day':
return $query->setParameter('display', 'day'); return $query->setParameter('display', 'day');
case 'upcoming': case 'upcoming':
return $query->setParameter('upcoming', array( return $query
0 => 'upcoming', ->setParameter('display', 'list')
)); ->setParameter('upcoming', array(
0 => 'upcoming',
));
case 'all': case 'all':
return $query; return $query;
} }

10
src/applications/repository/worker/PhabricatorRepositoryPushMailWorker.php
View file

@ -30,8 +30,14 @@ final class PhabricatorRepositoryPushMailWorker
$targets = id(new PhabricatorRepositoryPushReplyHandler()) $targets = id(new PhabricatorRepositoryPushReplyHandler())
->setMailReceiver($repository) ->setMailReceiver($repository)
->getMailTargets($email_phids, array()); ->getMailTargets($email_phids, array());
$messages = array();
foreach ($targets as $target) { foreach ($targets as $target) {
$this->sendMail($target, $repository, $event); $messages[] = $this->sendMail($target, $repository, $event);
}
foreach ($messages as $message) {
$message->save();
} }
} }
@ -121,7 +127,7 @@ final class PhabricatorRepositoryPushMailWorker
->addHeader('Thread-Topic', $subject) ->addHeader('Thread-Topic', $subject)
->setIsBulk(true); ->setIsBulk(true);
$target->sendMail($mail); return $target->willSendMail($mail);
} }
public function renderForDisplay(PhabricatorUser $viewer) { public function renderForDisplay(PhabricatorUser $viewer) {