summaryrefslogtreecommitdiff
path: root/app/Controller/ICalendarController.php
diff options
context:
space:
mode:
authorphecho <phecho@163.com>2016-12-21 10:58:41 +0800
committerphecho <phecho@163.com>2016-12-21 10:58:41 +0800
commit4724367e3b9c10af23bb6596f8f678477927c8c3 (patch)
tree06ee4e860252222c1784e182d87e22b879451751 /app/Controller/ICalendarController.php
parent56d00ac1592ba5ab7006dfd161f1893e1fdc9bb0 (diff)
parent9d5d389de841705450190fb1ebbaa11393870dfe (diff)
Fix conflict
Diffstat (limited to 'app/Controller/ICalendarController.php')
-rw-r--r--app/Controller/ICalendarController.php5
1 files changed, 1 insertions, 4 deletions
diff --git a/app/Controller/ICalendarController.php b/app/Controller/ICalendarController.php
index e354c6f1..4fe8b78a 100644
--- a/app/Controller/ICalendarController.php
+++ b/app/Controller/ICalendarController.php
@@ -7,7 +7,6 @@ use Kanboard\Core\Filter\QueryBuilder;
use Kanboard\Filter\TaskAssigneeFilter;
use Kanboard\Filter\TaskProjectFilter;
use Kanboard\Filter\TaskStatusFilter;
-use Kanboard\Formatter\TaskICalFormatter;
use Kanboard\Model\TaskModel;
use Eluceo\iCal\Component\Calendar as iCalendar;
@@ -94,8 +93,6 @@ class ICalendarController extends BaseController
$end = $this->request->getStringParam('end', strtotime('+6 months'));
$this->helper->ical->addTaskDateDueEvents($queryBuilder, $calendar, $start, $end);
-
- $formatter = new TaskICalFormatter($this->container);
- $this->response->ical($formatter->setCalendar($calendar)->format());
+ $this->response->ical($this->taskICalFormatter->setCalendar($calendar)->format());
}
}